Removing redundant functionality from the Order Populator