yorickvP clean up date code