Start of cleanup
more clean up