remove funcs
Continue to isolate