Remove works for Tools without restart

TODO: Find how to make an already running tool's removal better