More tweaks to try and get NFC working: remove extra NFC feature