More redirect cleanup