Lint clean up