Revert "Starting updates on TextController for handling different type of separators"

This reverts commit 88e8a89123b6890dc8071ed42f201f0b8a63a6df.
Merge branch 'cmartinez' into dev