Settings Application: Removed old code