Cleanup: Removing unused tools