Remove old implementation.