Remove TODO, constructor handles this.