Refactoring, commenting, fixing TODOs
Remove local.properties from git