Moved flow options w/o endpoint into parse_flow_option
Delete unecessary macro