JBIDE-16368: Some cleanup