Cleanup lint/cruft