please keep the deleted code to allow the switching to use the deleted logic