Clean Up

Removed “all” unnecessary code.