Remove unused code
Improve spec