Remove extra condition not needed