Remove old/commented code