I wonder if we can use an API for this and add it to cleanUp