Remove hardcoded check