remove some inactive code