Remove duplicated spec
Refactor after code review