remove some bad code