some cleanup of commented code