Fixes #5838: Clean up rudder-tools
Merge pull request #23 from peckpeck/bug_5838/clean_up_rudder_tools

Fixes #5838: Clean up rudder-tools