clean up
more cleanups