Clean up bitlock MACRO code