Revert "working with strings and cleanup"

This reverts commit 7b00c4876701bd865aef5167486153c05ce5fbe9.