Revert "Revert "clean up""

This reverts commit 326e3981b3de59af9976ef04ce643f225f1c9ae4.
clean up w/ breaking text insertion