Remove catalog block rewrites

Remove the catalog block rewrites to use a couple of event observers.
Merge branch 'scp-conflicts'