Remove service, add parent controller keeping track of state