add remove flow handling
fix