Cleanup TODO block services