Fix bolusJoiner

BolusJoiner now relies on the ordering of bolus records coming in to correlate bolus records
Remove unneeded files