order form cleanup