Make the pod structure consistent to remove demo includes.