Remove String class, use std::string instead