More code cleanup

With and without uniques are now clean including heatmap and metagene
generation code.  Ready for command line access work