Add back morphisms, remove some ported catdb things
Remove ported things from catdb
Remove silly things