Cleanup of mcollective.rake code