NFC Toggle clean up and fix