Cleanup in response to feedback