Cleaned up commented out code.