cleanup of commented out code