[Rakefile] Cleanup
[Bundle] Update