JBIDE-17938 - make tools core only, cleanup