am 16f64554: Merge "Second try removing orphaned items from the database" into ub-now-nova

* commit '16f645542a527c3b39e7e365c379d7a66f47e4ea':
  Second try removing orphaned items from the database