[TR, PO] {refactor} removed code not included in final version