initial commit for  JBIDE-13690
JBIDE-13690 further cleanup
duplicate method name? Not sure where that came from