ARM: cleanup code