Remove old commented code