remove unused crap
more cleanups