Remove now redundant field from InitialHandler