Made order's address references unnecessary