Removed the need for dateutils