Remove old commented stuff