NFC is now optional - via setting 'Near Field Communication'; minor refactoring