noa clean up