(ARM) Fix build and clean up.