More rakefile cleanup