Some partial cleanup of planning and definitions