Unnecessary client classes removed.