Remove unnecessary name from delivery classes