Removed a already-implemented TODO