Remove commented code #4