Removed RxJava
Improvements