JBIDE-13445 cleanup 2