fix dates, speed up deletion