cleaning up
start of cleanup