Cleanup based on review