removed some more lingering funcs