add local dump of Type for global vars
cleanup metadata dump
cleanup