Removing a fixed TODO...