remove some leftover code