Cleaning up Joynet & tef info