removing CFS-related stuff