Added removal of AuthPN vars