More cleanup for NEON: