Remove dependence on Foundation