Part way through removing xxxUnit functions
Adding debug markers to templates
Stop Unit function generation for Metadata files