Ported String types to Text

Changed all human-legible String types to Text. Also cleaned up some unnecessary type conversions and removed unused packages.
You are going from text to string back to text here.

You should just be able to wrap your s in a String.