NEAT cleanup