removed some unused stuff
removed unused stuff