#4 Remove: commented code