Updated stuff
Removed not required stuff