Further lint-removal