Fixed Redirect

Fixed a redirect that was disabled to help with debugging
Removed Obsolete Code
Cleaned up and removed obsolete code