Finished cleanup for click to identify for NA