Remove a lot of the ORM / notification residual