remove dependence on mass polling functions