Clean up code, delete commented out code