Preventing possible crash when checking for new data in the Preference screen; removing unused items (reported by Lint)