cleanup and chart returns