Clean up: The utility routines removed and code changed to use the same routines defined in dimac_utils.py