Revert "String Fixes and Orca Tools Update"

This reverts commit b4b24b1b95b73e211359a77940d73779c8482731.