remove some useness code