Remove nil condition