remove redundant regex-kludges