These commented lines are no longer needed?