little improvements in spec
remove dead code