Remove old regexp, remove unused variables