Cleanup TODO block services
initial ListBlock