Add spec.  Remove unnecessary code