Fixes #5838: Clean up rudder-tools