JBTIS-23 - continue cleanup