Remove old implementation to make way for new