Remove old comment and codes
Refactaring spec