Cleaning up clients properly now