cleanups; use sys_clone()