remove unnecessary client variables