added some cleanup tasks