Remove commented code #133