restore -init
remove dead code