Merge "[Settings] Code refactor - remove unused import lines"