WIP
Remove misguided function