Remove dependency on rxjava