Regexp have been replaced with naitve methods