Remove unecessary conditions