Removed TRIM_RIGHT() as strings loaded from the database into std::string are automatically rtrim()'d.