Fixed making redirect signature work, cleaned up.