remove delivery option validation; clean up some whitespace