Removed remnants of $cfs