MDL-41926 tool_generator: Removing unused vars