Refactor, tidy up, move some code to retirement; remove SourceExtractor catalog option
Further refactoring & cleanup