Remove regex mods, use std::regex instead