Major client cleanup