remove when step separation

there's no need to consider when steps as something separate from other steps