Trying to get Tool Remove to work
Revert "Trying to get Tool Remove to work"

This reverts commit 904624d0019b36f41c6c08db79adf57b351759d6.
Tool removal is much, much better