adding cleanup back in