Removed unused condition