stripped a bunch of now unused functionality from availability factory