Lint
Cleanup at app end