Remove dependency on ActiveHash