Remove commented and unused code