(ARM) Fix build and cleanup.