remove some code, unneeded