Flow cleanup