Refactored Redirect service
Removed unneccessary dependency