removed funcs, etc