Remove dependency on ActiveRecord