client cleanup merge