MANTA-78 removing old contig data structure, some clean up