Remove dependency to activesupport