removed some bad code