add jruesga's cleanup