Removed hardcoded condition