geehdc: Cleanup NFC

Change-Id: I6cfd08555539188c174b856080ed86f7081e6dea