Revert "Initial commit for settings changes"

This reverts commit 258640bf022b9c3b9f7387e19b181442852bd99b.