Replace logging with services layer