Fixed variable type for trigger mask + removed dependency from unused class