more clean up
changes