clean up Disc, remove 1st pymb2 query