Clean up case-2