Optimize clone procedure