Commentted out cleanup, it's not safe