change to updated version of user-api-client
remove un-needed helpers
complete switch to salinity