remove some of the new code