Add missing adapter calls, remove mimicing functions in cas code