Comitted the removal of the old implementation.