JBIDE-14363 - small cleanup, removal of incorrect labels, etc