Cleanup + enabled monitoring in blocks