Story 48833017: FINALLY fixing the delete object references