edited hai_cleanup to play around with past years' data
Resolve conflict in hai_data_cleanup, added IncorporatingData