JBIDE-13885 : cleanup

Signed-off-by: Fred Bricon <fbricon@gmail.com>