code cleanup/fixing issue with dateless files