Added clean up task