clean up to flowcore