Upgrade to Robolectric 2.0 and remove all the things...