Cleanup of Settings & Location