clean up a bunch more Zaptel-related references