Rakefile is clean now (hope it is for good)