Simplify plans

C15, C30, and C60 are adding another concept that is adds no value.