Cleanup before separating Charts-API