Revert "remove objects as well"

Reverts commit 68ef9faa4c592b3721387851b580470eec7e5f9d

(Will need to discuss the tool registration process further)