Merge "remove Cass references"