Upgrade to the 1.0.x RxJava release
Remove a few for loops and an unnecessary type definition