Remove extra condition