Removed crap we don't need, started work on the cfs endpoints