Cleanup of Rakefile