JBT - remove unused + revisioned

remove unused class and methods + revisioned architecture