Remove old commented stuff shouldn't have made it in