Cleaning up OID critical classes