More cfs client cleanup.
More cfs client cleanup.

gholt/megacfs,letterj/megacfs,wreese/megacfs,wreese/megacfs,letterj/megacfs,pandemicsyn/megacfs,creiht/megacfs,creiht/megacfs,getcfs/megacfs,gholt/megacfs,pandemicsyn/megacfs,getcfs/megacfs