remove references to form handlers