Remove old commented out code, add note