Removed v2 code and added redirection