NEON-1100 cleanup