JBIDE-15272 - cleanup