Stop using the stop character. Lots of cleanup as a result