cleanup lint gripes