Finished cleanup for click to identify for NA
Merge pull request #763 from isuftin/master

Finished cleanup for click to identify for NA