JBIDE-17842 - Cleanup as per fred