Get rid of obsolete function
Get rid of gntp requirement