Tidy up advanced options
Remove unused forms and classes
Remove unused forms and classes