Remove caf stuff and bring back normal repos