Clean Up

Removed unused code!