LOR-15: remove unused code