Removed unused code
Merge
Added string fixed bug