Removed unnecessary code
Some more unnecessary code