JBIDE-13207 - small cleanup