Remove dependency on activesupport
Cleanup spec deprecations