Fix issue where deletion predicate cleanup could evaluate before connections have been established, causing inappropriate object deletion. fixes #1607