removed unused stuff
some cleaning