Remove non-needed condition