Removed remnants of $cfs
Tagged 2.3.8