Cleaning up for new changes to ADAM format and processing steps.