Should these commented out lines be deleted?