[PRX-101] remove redundant substring operations