remove/modify clone, remove Lazy*, add TestSet
remove dead code