Contamination studies for deuterons
Removed unused stuff
Code cleanup