added cleanup and update task