Make sure client resources cleaned up