Implement Interceptor, remove unused service on controller and impact on edit test controller