Remove unecessary regexps

The string comparisons are a lot faster than the regexps, and without them we don't need ti include "regexp"