Remove the old implementation