Remove commented old code