cleaned up commented-out code and comments