Move setactiveclient into section for used methods