@mohamagdy I can see the old TODO here but are you sure it is safe now to remove it?