Remove catalog
misc
Merge remote-tracking branch 'origin/moar_efficient' into website_id