Removed TODO
O(1) note