Maybe remove the two comments - or is that still open?