Remove external rightClick plugin
Minor cleanups