Clean up masks

Masks should be unset by default