Tidied up the code some in MainActivity. Removed unused
methods/variables and re-enabled user settings.