Feature/charts cleanup