AssertUtil + Util clean up