cleaned up commented-out code