JBIDE-15272
JBIDE-15272 - cleanup