WIP deprecated stuff conversion