cleanup and added duedates