I think the cleanup is doing this but we have to check it first