cleanup: step definition regular expressions