Removed leftover TODO