Removing stuff
Removed more not needed stuff