JBIDE-16866 cleanup