GV-865 - Order code cleanup