JBIDE-13445 cleanup