Cleanup based on lint.