removed and old TODO comment