Clean Up

Removing commented code that is no longer needed.