Removed dead tool features