Cleanup, refs #21453
Prepare eea.forms 6.2.