several fixes. Removed import of RESTClinet (OSClient is used instead)