horrible wip - clean up illegal funcs that were legalized