cleaned flow segregation edit used for executive showcase

epic win..

Change-Id: I5999759ad2dce3dd9c58dfc081f7bbb1c319a0a0