remove some vestiges