Some ASM cleanup