Some code cleanup.
Updating deps. Locking rspec older version. ES and CD needs update first.