some code adjustments according to the migration of the REST api
nicer remove rest calls