cleaning up debugging
more cleanups