remove unused stuff
code improvements