remove some unneeded code