remove singleton stuff from responsibility of LegacyDatabase

Castle now handles it.
Tweaks to category watching