EPD-43: Clean up InfoPanel code