more evaluation form cleanup