Fixes for toSome Fixes and Deleted unnecessary files