[GAIA] - Removing unneeded code
Merge pull request #261 from michalbe/b6527-nfc-temp

[GAIA] - Removing unneeded code