Removed unused stuff
Removed unused stuff