Cleaning up Rxjava controller