Remove cloning, do cleanup