Cleanup: Fix broken Avalon monitor