Remove active_support dependency