Cleanup
Removed String aving