goodbye nfc

Change-Id: I1abf668e1d47346bb279c309ef05a8335ba46e67