Clean up project + remove CCF code