cleaning up some more for project integration