Fixing things
Removed unnecessary things