remove some un necessary construct for test case.