TFJ-817 remove deprecated methods in REST APIs
TFJ-817 deprecated streaming API methods made package private
TFJ-817
TFJ-817 simplified some code