Added extra cleanup