JBIDE-14413 - cleanup as per fbricon