Rakefile cleanups