Modified Cleanup tasks in Specs