Removed TD references
Updated variables used in TDLocatorRequest