Remove dependency on activesupport