Remove generic redirects to make sure works with client