Cleaning up based on the feedback