cleaning up before JBIDE-14165