Various asm cleanup