Cleanup and composite charts