Removing more stale db entries #308