Clean-up based on designers feedback