more clean ups
more and more cleanups