cleaned up commented out, and unused code, etc