Clean up

Removed unnecessary code