Remove commented code closes #2