Remove static code from settings class

Change-Id: I57c3f86d77ea68c980fb7b521894f524560524a2