Revert "substring"

This reverts commit f8d6cb43175bf890df453cb7990620c534c0243c.
substring