removed unsued stuff and fixed date format bug