more scrutinizer cleanup