Remove explicit block passing

Remove explicit block passing