removing some unused code that the closure compiler complained about
Merge branch 'master' into ui-contextmenu