Rakefile cleanup