Remove unneeded function
Introduce typedef for bitmask type