Added some cleanup tasks