Cleanup based on feedback