Fixing the date issue of import and removing shortcut code for now