Remove dead code.
Add some new specs