further simplify Rakefile