Remove redundant clone, drop MT composite machine