Spec helper cleanup