remove cloudlock references, ensure consistent schema access