arm: cleanup