cleanup + feature scenario