removing the local setting file committed, and refactoring