further NEON cleanup