Cleanup bitmask allocation
3 files changed