flags removed from asm following chat with Anthony, clean up