And prune some code now that the objects are gone