Simplify rake tasks

Since we no longer have the weird multiple branch setup, this gets
simplified.