remove unnessesary logic