Removing some bad code