Cleanup ChartMuseum to use v0.16.1