Cleanup

Update to latest Rx version