refactoring

removing interceptors