Added TODO roadmap for finishing CPS, removed dead code