removed pre-planning stuff (clutter now)