Cleanup all databases to remove dirty references
Fix command line test and CLI cleanup output to reflect new cleanup