substantial form cleanup