Remove dependency on ActiveSupport