Removed long redundant classes for form name popup entry and editing
Removal of methods and code (much of which was already commented out)
made redundant by the recent refactoring.