removing some bad code