Removed some dead lines