Clear out delivery fields just in case