Clean Up

Cleaning up unnecessary code