Remove old hacks to skip the zz_ prefix