remove some of unusefull code.