Charts cleanup