Adds String() methods back
cleanup