clean up of forms