Remove TOOD item for overloading support