Don't need to pull plan_id from session any more