Tidy up
Lint
Remove redundant dependencies
Tidy up
Prepare for build