Remove need for activesupport