Move cleanup to step definitions.