Remove CFP and add schedule info