removing delivery location from forms and signup tempalte