SZ-111: more framework cleanup