I was thinking about leaving it there until the refactoring is fully merged and I would make a single commit removing the old implementation and replacing with the new one.