Revert "Settings: Some House Keeping"

This reverts commit dceda1dbf5b3e7315e4a026e06415869f63bcd7a.