Drop redundant TODO remakt