cleaning up before JBIDE-14165
Resolved JBIDE-14165