Foodcritic cleanup