Remove residual cf-know, cf-report stuff
Standardize enum DatabaseType