Update/cleanup clone vm methods.