adding cleanup, currently non-functional