Fixes #5838: Clean up rudder-tools

http://www.rudder-project.org/redmine/issues/5838