Remove old implementation