Cleanup

Removed unnecessary code