Took away some dead lines of code