remove some unused dead code