Simpler cleanup