Removed dateutils dependency