Fixed remove tool feature