JMitchell wrote:
Yes, everything disappeared as I expected apart from the defaults.
I appear to be using the two classes template set although before I looked I thought I was using General...
That confusion could be the problem. For example if you firstly generated TwoClasses and then General, a bunch of EntityBase classes would remain at your project causing the problem.
Please do a small test: generate your desire template set in a empty folder, then remove some fields from a table, refresh catalog and generate again (take care of selection the correct template set) and see if the problem exists.