remove unused stuff
more cleaning