zap some dead code and make manual setup properly redirect again.