More cds-access-api cleanup