BAC-861:remove unused code