AssertUtil + Util + InstanceUtil clean up