diff --git a/source/NVDAObjects/IAccessible/ia2TextMozilla.py b/source/NVDAObjects/IAccessible/ia2TextMozilla.py
index 143ad1d4595..03930c51202 100644
--- a/source/NVDAObjects/IAccessible/ia2TextMozilla.py
+++ b/source/NVDAObjects/IAccessible/ia2TextMozilla.py
@@ -18,7 +18,7 @@
 from NVDAObjects import NVDAObject, NVDAObjectTextInfo
 from . import IA2TextTextInfo, IAccessible
 from compoundDocuments import CompoundTextInfo
-from locationHelper import RectLTWH
+import locationHelper
 
 class FakeEmbeddingTextInfo(textInfos.offsets.OffsetsTextInfo):
 
@@ -111,7 +111,7 @@ def __init__(self, obj, position):
 				self._startObj = self._endObj = tempObj
 			else:
 				self._start, self._startObj, self._end, self._endObj = self._findUnitEndpoints(tempTi, position)
-		elif isinstance(position, textInfos.Point):
+		elif isinstance(position, locationHelper.Point):
 			startObj = api.getDesktopObject().objectFromPoint(position.x, position.y)
 			while startObj and startObj.role == controlTypes.ROLE_STATICTEXT:
 				# Skip text leaf nodes.
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
index 9e24448b21b..9073e402ca7 100644
--- a/source/NVDAObjects/UIA/__init__.py
+++ b/source/NVDAObjects/UIA/__init__.py
@@ -30,7 +30,7 @@
 from NVDAObjects import NVDAObjectTextInfo, InvalidNVDAObject
 from NVDAObjects.behaviors import ProgressBar, EditableTextWithoutAutoSelectDetection, Dialog, Notification, EditableTextWithSuggestions
 import braille
-from locationHelper import RectLTWH
+import locationHelper
 import ui
 
 class UIATextInfo(textInfos.TextInfo):
@@ -308,10 +308,9 @@ def __init__(self,obj,position,_rangeObj=None):
 				raise LookupError
 			# sometimes rangeFromChild can return a NULL range
 			if not self._rangeObj: raise LookupError
-		elif isinstance(position,textInfos.Point):
+		elif isinstance(position,locationHelper.Point):
 			#rangeFromPoint used to cause a freeze in UIA client library!
-			p=POINT(position.x,position.y)
-			self._rangeObj=self.obj.UIATextPattern.RangeFromPoint(p)
+			self._rangeObj=self.obj.UIATextPattern.RangeFromPoint(position.toPOINT())
 		elif isinstance(position,UIAHandler.IUIAutomationTextRange):
 			self._rangeObj=position.clone()
 		else:
@@ -658,7 +657,7 @@ def _getBoundingRectsFromUIARange(self,range):
 		if not rectArray:
 			return rects
 		rectIndexes = xrange(0, len(rectArray), 4)
-		rectGen = (RectLTWH.fromFloatCollection(*rectArray[i:i+4]) for i in rectIndexes)
+		rectGen = (locationHelper.RectLTWH.fromFloatCollection(*rectArray[i:i+4]) for i in rectIndexes)
 		rects.extend(rectGen)
 		return rects
 
@@ -1353,7 +1352,7 @@ def _get_location(self):
 		if r is None:
 			return
 		# r is a tuple of floats representing left, top, width and height.
-		return RectLTWH.fromFloatCollection(*r)
+		return locationHelper.RectLTWH.fromFloatCollection(*r)
 
 	def _get_value(self):
 		val=self._getUIACacheablePropertyValue(UIAHandler.UIA_RangeValueValuePropertyId,True)
diff --git a/source/NVDAObjects/__init__.py b/source/NVDAObjects/__init__.py
index e8f65f3951f..74422175da8 100644
--- a/source/NVDAObjects/__init__.py
+++ b/source/NVDAObjects/__init__.py
@@ -28,6 +28,7 @@
 import braille
 import globalPluginHandler
 import brailleInput
+import locationHelper
 
 class NVDAObjectTextInfo(textInfos.offsets.OffsetsTextInfo):
 	"""A default TextInfo which is used to enable text review of information about widgets that don't support text content.
@@ -989,7 +990,7 @@ def event_mouseMove(self,x,y):
 			speechWasCanceled=False
 		self._mouseEntered=True
 		try:
-			info=self.makeTextInfo(textInfos.Point(x,y))
+			info=self.makeTextInfo(locationHelper.Point(x,y))
 		except NotImplementedError:
 			info=NVDAObjectTextInfo(self,textInfos.POSITION_FIRST)
 		except LookupError:
diff --git a/source/NVDAObjects/window/edit.py b/source/NVDAObjects/window/edit.py
index ce623664917..b007dda8cfc 100644
--- a/source/NVDAObjects/window/edit.py
+++ b/source/NVDAObjects/window/edit.py
@@ -32,6 +32,7 @@
 from ..behaviors import EditableTextWithAutoSelectDetection
 import braille
 import watchdog
+import locationHelper
 
 selOffsetsAtLastCaretEvent=None
 
@@ -170,10 +171,10 @@ def _getPointFromOffset(self,offset):
 				winKernel.readProcessMemory(processHandle,internalP,ctypes.byref(p),ctypes.sizeof(p),None)
 			finally:
 				winKernel.virtualFreeEx(processHandle,internalP,0,winKernel.MEM_RELEASE)
-			point=textInfos.Point(p.x,p.y)
+			point=locationHelper.Point(p.x,p.y)
 		else:
 			res=watchdog.cancellableSendMessage(self.obj.windowHandle,winUser.EM_POSFROMCHAR,offset,None)
-			point=textInfos.Point(winUser.GET_X_LPARAM(res),winUser.GET_Y_LPARAM(res))
+			point=locationHelper.Point(winUser.GET_X_LPARAM(res),winUser.GET_Y_LPARAM(res))
 		# A returned coordinate can be a negative value if
 		# the specified character is not displayed in the edit control's client area. 
 		# If the specified index is greater than the index of the last character in the control,
@@ -181,8 +182,7 @@ def _getPointFromOffset(self,offset):
 		if point.x <0 or point.y <0:
 			raise LookupError("Point with client coordinates x=%d, y=%d not within client area of object" %
 				(point.x, point.y))
-		point.x, point.y = winUser.ClientToScreen(self.obj.windowHandle, point.x, point.y)
-		return point
+		return point.toScreen(self.obj.windowHandle)
 
 
 	def _getOffsetFromPoint(self,x,y):
@@ -447,8 +447,7 @@ def _getParagraphOffsets(self,offset):
 class ITextDocumentTextInfo(textInfos.TextInfo):
 
 	def _get_pointAtStart(self):
-		p=textInfos.Point(0,0)
-		(p.x,p.y)=self._rangeObj.GetPoint(comInterfaces.tom.tomStart)
+		p=locationHelper.Point(*self._rangeObj.GetPoint(comInterfaces.tom.tomStart))
 		if p.x and p.y:
 			return p
 		else:
@@ -570,7 +569,7 @@ def _getEmbeddedObjectLabel(self,embedRangeObj):
 			r.collapse(1)
 			left,top=r.GetPoint(comInterfaces.tom.tomStart)
 		import displayModel
-		label=displayModel.DisplayModelTextInfo(self.obj, textInfos.Rect(left, top, right, bottom)).text
+		label=displayModel.DisplayModelTextInfo(self.obj, locationHelper.RectLTRB(left, top, right, bottom)).text
 		if label and not label.isspace():
 			return label
 		# Windows Live Mail exposes the label via the embedded object's data (IDataObject)
@@ -625,8 +624,8 @@ def __init__(self,obj,position,_rangeObj=None):
 		if _rangeObj:
 			self._rangeObj=_rangeObj.Duplicate
 			return
-		if isinstance(position,textInfos.Point):
-			self._rangeObj=self.obj.ITextDocumentObject.rangeFromPoint(position.x,position.y)
+		if isinstance(position,locationHelper.Point):
+			self._rangeObj=self.obj.ITextDocumentObject.rangeFromPoint(*position)
 		elif position==textInfos.POSITION_ALL:
 			self._rangeObj=self.obj.ITextDocumentObject.range(0,0)
 			self._rangeObj.expand(comInterfaces.tom.tomStory)
diff --git a/source/NVDAObjects/window/scintilla.py b/source/NVDAObjects/window/scintilla.py
index 130ac9ba1d7..8527d03f1e0 100755
--- a/source/NVDAObjects/window/scintilla.py
+++ b/source/NVDAObjects/window/scintilla.py
@@ -13,6 +13,7 @@
 import locale
 import watchdog
 import eventHandler
+import locationHelper
 
 # Window messages
 SCI_POSITIONFROMPOINT=2022
@@ -72,11 +73,10 @@ def _getOffsetFromPoint(self,x,y):
 		return watchdog.cancellableSendMessage(self.obj.windowHandle,SCI_POSITIONFROMPOINT,x,y)
 
 	def _getPointFromOffset(self,offset):
-		x, y = winUser.ClientToScreen(self.obj.windowHandle,
+		point=locationHelper.Point(
 			watchdog.cancellableSendMessage(self.obj.windowHandle,SCI_POINTXFROMPOSITION,None,offset),
 			watchdog.cancellableSendMessage(self.obj.windowHandle,SCI_POINTYFROMPOSITION,None,offset)
-		)
-		point=textInfos.Point(x, y)
+		).toScreen(self.obj.windowHandle)
 		if point.x is not None and point.y is not None:
 			return point
 		else:
diff --git a/source/NVDAObjects/window/winword.py b/source/NVDAObjects/window/winword.py
index 87464e77556..1293125ea24 100755
--- a/source/NVDAObjects/window/winword.py
+++ b/source/NVDAObjects/window/winword.py
@@ -40,7 +40,7 @@
 from . import Window
 from ..behaviors import EditableTextWithoutAutoSelectDetection
 from . import _msOfficeChart
-from textInfos import Point
+import locationHelper
 
 #Word constants
 
@@ -661,7 +661,7 @@ def __init__(self,obj,position,_rangeObj=None):
 		if _rangeObj:
 			self._rangeObj=_rangeObj.Duplicate
 			return
-		if isinstance(position,textInfos.Point):
+		if isinstance(position, locationHelper.Point):
 			try:
 				self._rangeObj=self.obj.WinwordDocumentObject.activeWindow.RangeFromPoint(position.x,position.y)
 			except COMError:
@@ -1018,7 +1018,7 @@ def _get_pointAtStart(self):
 			raise LookupError
 		if not any((left.value, top.value, width.value, height.value)):
 			raise LookupError
-		return Point(left.value, top.value)
+		return locationHelper.Point(left.value, top.value)
 
 	def updateCaret(self):
 		self.obj.WinwordWindowObject.ScrollIntoView(self._rangeObj)
diff --git a/source/appModules/explorer.py b/source/appModules/explorer.py
index 603a870d6ab..f46b153df27 100644
--- a/source/appModules/explorer.py
+++ b/source/appModules/explorer.py
@@ -66,18 +66,6 @@ def _get_shouldAllowIAccessibleFocusEvent(self):
 			return True
 		return False
 
-
-class ClassicStartMenu(Window):
-	# Override the name, as Windows names this the "Application" menu contrary to all documentation.
-	# Translators: The title of Start menu/screen in your language (only the word start).
-	name = _("Start")
-
-	def event_gainFocus(self):
-		# In Windows XP, the Start button will get focus first, so silence this.
-		speech.cancelSpeech()
-		super(ClassicStartMenu, self).event_gainFocus()
-
-
 class NotificationArea(IAccessible):
 	"""The Windows notification area, a.k.a. system tray.
 	"""
@@ -199,14 +187,7 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 			return # Optimization: return early to avoid comparing class names and roles that will never match.
 
 		if windowClass == "ToolbarWindow32":
-			if role == controlTypes.ROLE_POPUPMENU:
-				parent = obj.parent
-				if parent and parent.windowClassName == "SysPager" and obj.windowStyle & 0x80:
-					clsList.insert(0, ClassicStartMenu)
-			else:
-				# Check whether this is the notification area, a.k.a. system tray.
-				if isinstance(obj.parent, ClassicStartMenu):
-					return # This can't be a notification area
+			if role != controlTypes.ROLE_POPUPMENU:
 				try:
 					# The toolbar's immediate parent is its window object, so we need to go one further.
 					toolbarParent = obj.parent.parent
@@ -280,7 +261,7 @@ def event_NVDAObject_init(self, obj):
 			return
 
 		if windowClass == "DV2ControlHost" and role == controlTypes.ROLE_PANE:
-			# Windows Vista/7 start menu.
+			# Windows 7 start menu.
 			obj.presentationType=obj.presType_content
 			obj.isPresentableFocusAncestor = True
 			# In Windows 7, the description of this pane is extremely verbose help text, so nuke it.
diff --git a/source/appModules/klangoplayer.py b/source/appModules/klangoplayer.py
deleted file mode 100644
index eaa94a1dabe..00000000000
--- a/source/appModules/klangoplayer.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#appModules/klangoplayer.py
-
-import appModuleHandler
-
-class AppModule(appModuleHandler.AppModule):
-
-	sleepMode=True
diff --git a/source/appModules/outlook.py b/source/appModules/outlook.py
index c9777c5c133..9dc00b39ec0 100644
--- a/source/appModules/outlook.py
+++ b/source/appModules/outlook.py
@@ -201,9 +201,12 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 			return
 		if (windowClassName=="SUPERGRID" and controlID==4704) or (windowClassName=="rctrl_renwnd32" and controlID==109):
 			outlookVersion=self.outlookVersion
-			if outlookVersion and outlookVersion<=9:
-				clsList.insert(0, MessageList_pre2003)
-			elif obj.event_objectID==winUser.OBJID_CLIENT and obj.event_childID==0:
+			if (
+				outlookVersion
+				and outlookVersion > 9
+				and obj.event_objectID==winUser.OBJID_CLIENT
+				and obj.event_childID==0
+			):
 				clsList.insert(0,SuperGridClient2010)
 		if (windowClassName == "AfxWndW" and controlID==109) or (windowClassName in ("WeekViewWnd","DayViewWnd")):
 			clsList.insert(0,CalendarView)
@@ -246,67 +249,6 @@ def event_gainFocus(self):
 		obj.parent=self.parent
 		eventHandler.executeEvent("gainFocus",obj)
 
-class MessageList_pre2003(IAccessible):
-
-	def _get_name(self):
-		if hasattr(self,'curMessageItem'):
-			return self.curMessageItem.msg.parent.name
-
-	def _get_role(self):
-		return controlTypes.ROLE_LIST
-
-	def _get_firstChild(self):
-		return getattr(self,"curMessageItem",None)
-
-	def _get_children(self):
-		child=getattr(self,"curMessageItem",None)
-		if child:
-			return [child]
-		else:
-			return []
-
-	def event_gainFocus(self):
-		try:
-			msg=self.nativeOm.ActiveExplorer().selection[0]
-		except:
-			msg=None
-			pass
-		if msg:
-			self.curMessageItem=MessageItem(self,msg)
-		super(MessageList_pre2003,self).event_gainFocus()
-		if msg:
-			eventHandler.executeEvent("gainFocus",self.curMessageItem)
-
-	def script_moveByMessage(self,gesture):
-		if hasattr(self,'curMessageItem'):
-			oldEntryID=self.curMessageItem.msg.entryID
-		else:
-			oldEntryID=None
-		gesture.send()
-		try:
-			msg=self.nativeOm.ActiveExplorer().selection[0]
-		except:
-			msg=None
-			pass
-		if msg:
-			messageItem=MessageItem(self,msg)
-			newEntryID=messageItem.msg.entryID
-			if newEntryID!=oldEntryID:
-				self.curMessageItem=messageItem
-				eventHandler.executeEvent("gainFocus",messageItem)
-
-	__moveByMessageGestures = (
-		"kb:downArrow",
-		"kb:upArrow",
-		"kb:home",
-		"kb:end",
-		"kb:delete",
-	)
-
-	def initOverlayClass(self):
-		for gesture in self.__moveByMessageGestures:
-			self.bindGesture(gesture, "moveByMessage")
-
 class MessageItem(Window):
 
 	def __init__(self,windowHandle=None,parent=None,msg=None):
diff --git a/source/appModules/skype.py b/source/appModules/skype.py
index 8131324f1b7..1c42e161b38 100644
--- a/source/appModules/skype.py
+++ b/source/appModules/skype.py
@@ -1,265 +1,11 @@
 # -*- coding: UTF-8 -*-
 #appModules/skype.py
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2007-2019 Peter Vágner, NV Access Limited, Babbage B.V.
+#Copyright (C) 2019 Peter Vágner, NV Access Limited, Babbage B.V.
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
-import re
-from comtypes import COMError
-import wx
 import appModuleHandler
-import controlTypes
-import winUser
-import NVDAObjects.IAccessible
-import oleacc
-import ui
-import windowUtils
-import displayModel
-import queueHandler
-import config
-import NVDAObjects.behaviors
-import api
-from logHandler import log
-
-# Translators: The name of the NVDA command category for Skype specific commands.
-SCRCAT_SKYPE = _("Skype")
-
-TYPING_INDICATOR_MATCH = {
-	("TTypingIndicatorPanel", controlTypes.ROLE_STATICTEXT),
-	("TWidgetControl", controlTypes.ROLE_LISTITEM), # Skype <= 7.2
-}
-
-class Conversation(NVDAObjects.IAccessible.IAccessible):
-	scriptCategory = SCRCAT_SKYPE
-
-	def initOverlayClass(self):
-		for n in xrange(0, 10):
-			self.bindGesture("kb:NVDA+control+%d" % n, "reviewRecentMessage")
-
-	def _isEqual(self, other):
-		# Sometimes, we get this object as an unproxied IAccessible,
-		# which means the location is different, so IAccessible._isEqual return False.
-		# This can cause us to get a gainFocus and a focusEntered on two different instances.
-		# We don't care about the location here.
-		return self.windowHandle == other.windowHandle
-
-	def _gainedFocus(self):
-		# The user has entered this Skype conversation.
-		if self.appModule.conversation:
-			# Another conversation was previously focused. Clean it up.
-			self.appModule.conversation.lostFocus()
-
-		self.appModule.conversation = self
-		try:
-			self.outputList = NVDAObjects.IAccessible.getNVDAObjectFromEvent(
-				windowUtils.findDescendantWindow(self.windowHandle, className="TChatContentControl"),
-				winUser.OBJID_CLIENT, 0).lastChild
-		except LookupError:
-			log.debugWarning("Couldn't find output list")
-			self.outputList = None
-		else:
-			self.outputList.startMonitoring()
-		for wClass, role in TYPING_INDICATOR_MATCH:
-			try:
-				self.typingIndicator = NVDAObjects.IAccessible.getNVDAObjectFromEvent(
-					windowUtils.findDescendantWindow(self.windowHandle, className=wClass),
-					winUser.OBJID_CLIENT, 1)
-			except LookupError:
-				continue
-			self.typingIndicator.startMonitoring()
-			break
-		else:
-			log.debugWarning("Couldn't find typing indicator")
-			self.typingIndicator = None
-
-	def event_focusEntered(self):
-		self._gainedFocus()
-		super(Conversation, self).event_focusEntered()
-
-	def event_gainFocus(self):
-		# A conversation might have its own top level window,
-		# but foreground changes often trigger gainFocus instead of focusEntered.
-		self._gainedFocus()
-		super(Conversation, self).event_gainFocus()
-
-	def lostFocus(self):
-		self.appModule.conversation = None
-		if self.outputList:
-			self.outputList.stopMonitoring()
-			self.outputList = None
-		if self.typingIndicator:
-			self.typingIndicator.stopMonitoring()
-			self.typingIndicator = None
-
-	def script_reviewRecentMessage(self, gesture):
-		try:
-			index = int(gesture.mainKeyName[-1])
-		except (AttributeError, ValueError):
-			return
-		if index == 0:
-			index = 10
-		self.outputList.reviewRecentMessage(index)
-	# Describes the NVDA command to review messages in Skype.
-	script_reviewRecentMessage.__doc__ = _("Reports and moves the review cursor to a recent message")
-	script_reviewRecentMessage.canPropagate = True
-
-class ChatOutputList(NVDAObjects.IAccessible.IAccessible):
-
-	def startMonitoring(self):
-		self.oldMessageCount = None
-		self.update(initial=True)
-		displayModel.requestTextChangeNotifications(self, True)
-
-	def stopMonitoring(self):
-		displayModel.requestTextChangeNotifications(self, False)
-
-	RE_MESSAGE = re.compile(r"^From (?P<from>.*), (?P<body>.*), sent on (?P<time>.*?)(?: Edited by .* at .*?)?(?: Not delivered|New)?$")
-	def reportMessage(self, text):
-		# Messages are ridiculously verbose.
-		# Strip the time and other metadata if possible.
-		m = self.RE_MESSAGE.match(text)
-		if m:
-			text = "%s, %s" % (m.group("from"), m.group("body"))
-		ui.message(text)
-
-	def _getMessageCount(self):
-		ia = self.IAccessibleObject
-		for c in xrange(self.childCount, -1, -1):
-			try:
-				if ia.accRole(c) != oleacc.ROLE_SYSTEM_LISTITEM or ia.accState(c) & oleacc.STATE_SYSTEM_UNAVAILABLE:
-					# Not a message.
-					continue
-			except COMError:
-				# The child probably disappeared after we fetched childCount.
-				continue
-			return c
-		return 0
-
-	def update(self, initial=False):
-		newCount = self._getMessageCount()
-		if (not initial and config.conf["presentation"]["reportDynamicContentChanges"]
-				#4644: Don't report a flood of messages.
-				and newCount - self.oldMessageCount < 5):
-			ia = self.IAccessibleObject
-			for c in xrange(self.oldMessageCount + 1, newCount + 1):
-				text = ia.accName(c)
-				if not text:
-					continue
-				self.reportMessage(text)
-		self.oldMessageCount = newCount
-
-	def event_textChange(self):
-		# This event is called from another thread, but this needs to run in the main thread.
-		queueHandler.queueFunction(queueHandler.eventQueue, self.update)
-
-	def reviewRecentMessage(self, index):
-		count = self._getMessageCount()
-		if index > count:
-			# Translators: This is presented to inform the user that no instant message has been received.
-			ui.message(_("No message yet"))
-			return
-		message = self.getChild(count - index)
-		# Reviewing a message should not auto tether
-		api.setNavigatorObject(message, isFocus=True)
-		self.reportMessage(message.name)
-
-class Notification(NVDAObjects.behaviors.Notification):
-	role = controlTypes.ROLE_ALERT
-	_lastWindow = None
-	_lastChildCount = None
-
-	def _get_name(self):
-		startIndex = 0
-		if self.event_objectID is not None:
-			# This is for an event.
-			if self.windowHandle == self._lastWindow:
-				# Another notification is being added to an already visible window.
-				# Just report the added notification.
-				startIndex = self._lastChildCount
-		return " ".join(child.name for child in self.children[startIndex:])
-
-	def event_alert(self):
-		if self.name:
-			# There is new content.
-			super(Notification, self).event_alert()
-		Notification._lastWindow = self.windowHandle
-		Notification._lastChildCount = self.childCount
-
-	# #5405: Some notifications (e.g. if you click once on the System Tray icon) only fire a show event.
-	# These are ready as soon as the event is fired.
-	event_show = event_alert
-	# #5405: Most notifications fire show, but aren't ready at this point.
-	# They then fire reorder when they're ready.
-	# #4841: They also fire reorder if another notification is later added to the same window.
-	event_reorder = event_alert
-
-class TypingIndicator(NVDAObjects.IAccessible.IAccessible):
-
-	def initOverlayClass(self):
-		self._oldName = None
-
-	def startMonitoring(self):
-		displayModel.requestTextChangeNotifications(self, True)
-
-	def stopMonitoring(self):
-		displayModel.requestTextChangeNotifications(self, False)
-
-	def _maybeReport(self):
-		name = self.name
-		if name == self._oldName:
-			# There was no real change; just a redraw.
-			return
-		self._oldName = name
-		if name:
-			ui.message(name)
-		else:
-			# Translators: Indicates that a contact stopped typing.
-			ui.message(_("Typing stopped"))
-
-	def event_textChange(self):
-		# This event is called from another thread, but this needs to run in the main thread.
-		queueHandler.queueFunction(queueHandler.eventQueue, self._maybeReport)
 
 class AppModule(appModuleHandler.AppModule):
 	disableBrowseModeByDefault = True
-
-	def __init__(self, *args, **kwargs):
-		super(AppModule, self).__init__(*args, **kwargs)
-		self.conversation = None
-
-	def event_NVDAObject_init(self,obj):
-		if isinstance(obj, NVDAObjects.IAccessible.IAccessible) and obj.event_objectID is None and controlTypes.STATE_FOCUSED in obj.states and obj.role not in (controlTypes.ROLE_POPUPMENU,controlTypes.ROLE_MENUITEM,controlTypes.ROLE_MENUBAR):
-			# The window handle reported by Skype accessibles is sometimes incorrect.
-			# This object is focused, so we can override with the focus window.
-			obj.windowHandle=winUser.getGUIThreadInfo(None).hwndFocus
-			obj.windowClassName=winUser.getClassName(obj.windowHandle)
-		if obj.value and obj.windowClassName in ("TMainUserList", "TConversationList", "TInboxList", "TActiveConversationList", "TConversationsControl"):
-			# The name and value both include the user's name, so kill the value to avoid doubling up.
-			# The value includes the Skype name,
-			# but we care more about the additional info (e.g. new event count) included in the name.
-			obj.value=None
-		elif isinstance(obj, NVDAObjects.IAccessible.IAccessible) and obj.IAccessibleRole == oleacc.ROLE_SYSTEM_PANE and not obj.name:
-			# Prevent extraneous reporting of pane when tabbing through a conversation form.
-			obj.shouldAllowIAccessibleFocusEvent = False
-
-	def chooseNVDAObjectOverlayClasses(self, obj, clsList):
-		wClass = obj.windowClassName
-		role = obj.role
-		if isinstance(obj, NVDAObjects.IAccessible.IAccessible) and obj.windowClassName == "TConversationForm" and obj.IAccessibleRole == oleacc.ROLE_SYSTEM_CLIENT:
-			clsList.insert(0, Conversation)
-		elif wClass == "TChatContentControl" and role == controlTypes.ROLE_LIST:
-			clsList.insert(0, ChatOutputList)
-		elif isinstance(obj, NVDAObjects.IAccessible.IAccessible) and wClass == "TTrayAlert" and obj.IAccessibleChildID == 0:
-			clsList.insert(0, Notification)
-		elif (wClass, role) in TYPING_INDICATOR_MATCH:
-			clsList.insert(0, TypingIndicator)
-
-	def event_gainFocus(self, obj, nextHandler):
-		if self.conversation and not winUser.isDescendantWindow(self.conversation.windowHandle, obj.windowHandle):
-			self.conversation.lostFocus()
-		nextHandler()
-
-	def event_appModule_loseFocus(self):
-		if self.conversation:
-			self.conversation.lostFocus()
diff --git a/source/appModules/sndrec32.py b/source/appModules/sndrec32.py
deleted file mode 100644
index a946ef06ddb..00000000000
--- a/source/appModules/sndrec32.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#appModules/sndrec32.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2010 Peter Vagner <peter.v@datagate.sk>
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
-
-import appModuleHandler
-import controlTypes
-
-mainWindowButtonNames={
-	# Translators: This is the name of a button in sound recorder.
-	205:_("Rewind"),
-	# Translators: This is the name of a button in sound recorder.
-	206:_("Fast forward"),
-	# Translators: This is the name of a button in sound recorder.
-	207:_("Play"),
-	# Translators: This is the name of a button in sound recorder.
-	208:_("Stop"),
-	# Translators: This is the name of a button in sound recorder.
-	209:_("Record")
-}
-
-class AppModule(appModuleHandler.AppModule):
-
-	def event_NVDAObject_init(self, obj):
-		if obj.role == controlTypes.ROLE_BUTTON: 
-			try:
-				obj.name=mainWindowButtonNames[obj.windowControlID]
-			except KeyError:
-				pass
diff --git a/source/appModules/tween.py b/source/appModules/tween.py
index e32e0328eab..829fa0fbc98 100644
--- a/source/appModules/tween.py
+++ b/source/appModules/tween.py
@@ -13,7 +13,7 @@
 import winUser
 from NVDAObjects.IAccessible.sysListView32 import ListItem
 import displayModel
-import textInfos
+import locationHelper
 
 class TweetListItem(ListItem):
 
@@ -41,7 +41,7 @@ def _getColumnContentRaw(self, index):
 			# so use display model.
 			left, top, width, height = self._getColumnLocationRaw(index)
 			content = displayModel.DisplayModelTextInfo(self,
-				textInfos.Rect(left, top, left + width, top + height)).text
+				locationHelper.RectLTRB(left, top, left + width, top + height)).text
 			if content:
 				return content
 		return super(TweetListItem, self)._getColumnContentRaw(index)
diff --git a/source/appModules/utorrent.py b/source/appModules/utorrent.py
index 5325f9b362c..0a6ce312128 100644
--- a/source/appModules/utorrent.py
+++ b/source/appModules/utorrent.py
@@ -16,7 +16,7 @@
 from NVDAObjects.IAccessible import IAccessible
 from NVDAObjects.window import Window
 from NVDAObjects.IAccessible.sysListView32 import ListItem
-import textInfos
+import locationHelper
 
 class DuplicateFocusListView(IAccessible):
 	"""A list view which annoyingly fires focus events every second, even when a menu is open.
@@ -46,7 +46,7 @@ def _getColumnContent(self, column):
 		# We need to use the display model to retrieve the Name column.
 		try:
 			left, top, width, height = self._getColumnLocation(column)
-			return displayModel.DisplayModelTextInfo(self, textInfos.Rect(
+			return displayModel.DisplayModelTextInfo(self, locationHelper.RectLTRB(
 				left, top, left + width, top + height)).text
 		except:
 			log.debugWarning("Error retrieving name using display model", exc_info=True)
diff --git a/source/braille.py b/source/braille.py
index 488db0cd920..8c1ce95ca2d 100644
--- a/source/braille.py
+++ b/source/braille.py
@@ -1591,10 +1591,6 @@ def terminate(self):
 	def getTether(self):
 		return self._tether
 
-	def _get_tether(self):
-		"""@deprecated: Use L{getTether instead."""
-		return self.getTether()
-
 	def setTether(self, tether, auto=False):
 		if auto and not self.shouldAutoTether:
 			return
@@ -1605,10 +1601,6 @@ def setTether(self, tether, auto=False):
 		self._tether = tether
 		self.mainBuffer.clear()
 
-	def _set_tether(self, tether):
-		"""@deprecated: Use L{setTether instead."""
-		self.setTether(tether, auto=False)
-
 	def _get_shouldAutoTether(self):
 		return self.enabled and config.conf["braille"]["autoTether"]
 
@@ -1743,7 +1735,7 @@ def _displayWithCursor(self):
 			return
 		cells = list(self._cells)
 		if self._cursorPos is not None and self._cursorBlinkUp:
-			if self.tether == self.TETHER_FOCUS:
+			if self.getTether() == self.TETHER_FOCUS:
 				cells[self._cursorPos] |= config.conf["braille"]["cursorShapeFocus"]
 			else:
 				cells[self._cursorPos] |= config.conf["braille"]["cursorShapeReview"]
@@ -1844,7 +1836,7 @@ def _doNewObject(self, regions):
 		self.mainBuffer.clear()
 		focusToHardLeftSet = False
 		for region in regions:
-			if self.tether == self.TETHER_FOCUS and config.conf["braille"]["focusContextPresentation"]==CONTEXTPRES_CHANGEDCONTEXT:
+			if self.getTether() == self.TETHER_FOCUS and config.conf["braille"]["focusContextPresentation"]==CONTEXTPRES_CHANGEDCONTEXT:
 				# Check focusToHardLeft for every region.
 				# If noone of the regions has focusToHardLeft set to True, set it for the first focus region.
 				if region.focusToHardLeft:
@@ -1973,7 +1965,7 @@ def initialDisplay(self):
 		if not self.enabled or not api.getDesktopObject():
 			# Braille is disabled or focus/review hasn't yet been initialised.
 			return
-		if self.tether == self.TETHER_FOCUS:
+		if self.getTether() == self.TETHER_FOCUS:
 			self.handleGainFocus(api.getFocusObject(), shouldAutoTether=False)
 		else:
 			self.handleReviewMove(shouldAutoTether=False)
diff --git a/source/config/__init__.py b/source/config/__init__.py
index c0f2e62c41b..e3ee3dd6441 100644
--- a/source/config/__init__.py
+++ b/source/config/__init__.py
@@ -850,21 +850,6 @@ def _getConfigValidation(self, spec):
 		"""
 		return conf.validator._parse_with_caching(spec)
 
-	def getConfigValidationParameter(self, keyPath, validationParameter):
-		"""@deprecated: Use L{getConfigValidation} instead.
-		Get a config validation parameter
-		This can be used to get the min, max, or other values for a config key.
-
-		Note: does not work for default, convertFunction, or options. Use L{getConfigValidation} instead.
-
-		@param keyPath: a sequence of the identifiers leading to the config key. EG ("braille", "messageTimeout")
-		@param validationParameter: the parameter to return the value for. EG "max"
-		@type validationParameter: string
-		"""
-		spec = self._getSpecFromKeyPath(keyPath)
-		parsedSpec = self._getConfigValidation(spec)
-		return parsedSpec[2][validationParameter]
-
 	def getConfigValidation(self, keyPath):
 		"""Get a config validation details
 		This can be used to get a L{ConfigValidationData} containing the type, default, options list, or
@@ -875,8 +860,8 @@ def getConfigValidation(self, keyPath):
 		spec = self._getSpecFromKeyPath(keyPath)
 		parsedSpec = self._getConfigValidation(spec)
 		data = ConfigValidationData(parsedSpec[0])
-		data.args = [1]
-		data.kwargs = [2]
+		data.args = parsedSpec[1]
+		data.kwargs = parsedSpec[2]
 		data.default = conf.validator.get_default_value(spec)
 		return data
 
diff --git a/source/displayModel.py b/source/displayModel.py
index 01bd7e5682f..b740b49d84e 100644
--- a/source/displayModel.py
+++ b/source/displayModel.py
@@ -254,7 +254,7 @@ def _getSelectionOffsets(self):
 		raise LookupError
 
 	def __init__(self, obj, position,limitRect=None):
-		if isinstance(position, textInfos.Rect):
+		if isinstance(position, RectLTRB):
 			limitRect=position
 			position=textInfos.POSITION_ALL
 		if limitRect is not None:
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
index 8f8e182ef11..15eda0f7d4e 100644
--- a/source/gui/settingsDialogs.py
+++ b/source/gui/settingsDialogs.py
@@ -1223,8 +1223,8 @@ def makeSettings(self, settingsSizer):
 		# Translators: This is a label for a setting in voice settings (an edit box to change voice pitch for capital letters; the higher the value, the pitch will be higher).
 		capPitchChangeLabelText=_("Capital pitch change percentage")
 		self.capPitchChangeEdit=settingsSizerHelper.addLabeledControl(capPitchChangeLabelText, nvdaControls.SelectOnFocusSpinCtrl,
-			min=int(config.conf.getConfigValidationParameter(["speech", self.driver.name, "capPitchChange"], "min")),
-			max=int(config.conf.getConfigValidationParameter(["speech", self.driver.name, "capPitchChange"], "max")),
+			min=int(config.conf.getConfigValidation(("speech", self.driver.name, "capPitchChange")).kwargs["min"]),
+			max=int(config.conf.getConfigValidation(("speech", self.driver.name, "capPitchChange")).kwargs["max"]),
 			initial=config.conf["speech"][self.driver.name]["capPitchChange"])
 
 		# Translators: This is the label for a checkbox in the
@@ -2662,8 +2662,8 @@ def makeSettings(self, settingsSizer):
 
 		# Translators: The label for a setting in braille settings to change cursor blink rate in milliseconds (1 second is 1000 milliseconds).
 		cursorBlinkRateLabelText = _("Cursor blink rate (ms)")
-		minBlinkRate = int(config.conf.getConfigValidationParameter(["braille", "cursorBlinkRate"], "min"))
-		maxBlinkRate = int(config.conf.getConfigValidationParameter(["braille", "cursorBlinkRate"], "max"))
+		minBlinkRate = int(config.conf.getConfigValidation(("braille", "cursorBlinkRate")).kwargs["min"])
+		maxBlinkRate = int(config.conf.getConfigValidation(("braille", "cursorBlinkRate")).kwargs["max"])
 		self.cursorBlinkRateEdit = sHelper.addLabeledControl(cursorBlinkRateLabelText, nvdaControls.SelectOnFocusSpinCtrl,
 			min=minBlinkRate, max=maxBlinkRate, initial=config.conf["braille"]["cursorBlinkRate"])
 		if not self.showCursorCheckBox.GetValue() or not self.cursorBlinkCheckBox.GetValue() :
@@ -2699,8 +2699,8 @@ def makeSettings(self, settingsSizer):
 		# Translators: The label for a setting in braille settings to change how long a message stays on the braille display (in seconds).
 		messageTimeoutText = _("Message &timeout (sec)")
 		self.messageTimeoutEdit = sHelper.addLabeledControl(messageTimeoutText, nvdaControls.SelectOnFocusSpinCtrl,
-			min=int(config.conf.getConfigValidationParameter(["braille", "messageTimeout"], "min")),
-			max=int(config.conf.getConfigValidationParameter(["braille", "messageTimeout"], "max")),
+			min=int(config.conf.getConfigValidation(("braille", "messageTimeout")).kwargs["min"]),
+			max=int(config.conf.getConfigValidation(("braille", "messageTimeout")).kwargs["max"]),
 			initial=config.conf["braille"]["messageTimeout"])
 
 		# Translators: The label for a setting in braille settings to display a message on the braille display indefinitely.
diff --git a/source/inputCore.py b/source/inputCore.py
index 4b1efe01d12..b6cd974fdb3 100644
--- a/source/inputCore.py
+++ b/source/inputCore.py
@@ -99,11 +99,6 @@ def _get_normalizedIdentifiers(self):
 		"""
 		return [normalizeGestureIdentifier(identifier) for identifier in self.identifiers]
 
-	def _get_logIdentifier(self):
-		"""@deprecated: Use L{InputGesture.identifiers}[0] instead.
-		"""
-		return self.identifiers[0]
-
 	def _get_displayName(self):
 		"""The name of this gesture as presented to the user.
 		The base implementation calls L{getDisplayTextForIdentifier} for the first identifier.
diff --git a/source/locationHelper.py b/source/locationHelper.py
index 11dc55f45eb..92575c50765 100644
--- a/source/locationHelper.py
+++ b/source/locationHelper.py
@@ -10,7 +10,6 @@
 import windowUtils
 import winUser
 from ctypes.wintypes import RECT, POINT, DWORD
-import textInfos
 import wx
 
 class Point(namedtuple("Point",("x","y"))):
@@ -405,7 +404,7 @@ def toLTWH(self):
 
 #: Classes which support conversion to locationHelper Points using their x and y properties.
 #: type: tuple
-POINT_CLASSES=(Point, POINT, textInfos.Point, wx.Point)
+POINT_CLASSES=(Point, POINT, wx.Point)
 #: Classes which support conversion to locationHelper RectLTRB/LTWH using their left, top, right and bottom properties.
 #: type: tuple
-RECT_CLASSES=(RectLTRB, RectLTWH, RECT, textInfos.Rect)
+RECT_CLASSES=(RectLTRB, RectLTWH, RECT)
diff --git a/source/nvda.pyw b/source/nvda.pyw
index 21c1e1fafa9..9ec3d236d56 100755
--- a/source/nvda.pyw
+++ b/source/nvda.pyw
@@ -19,8 +19,6 @@ else:
 	#We should always change directory to the location of this module (nvda.pyw), don't rely on sys.path[0]
 	os.chdir(os.path.normpath(os.path.dirname(__file__)))
 
-import pythonMonkeyPatches
-
 import ctypes
 import locale
 import gettext
diff --git a/source/nvda_slave.pyw b/source/nvda_slave.pyw
index fb299874f3d..632682b9ea3 100755
--- a/source/nvda_slave.pyw
+++ b/source/nvda_slave.pyw
@@ -16,8 +16,6 @@ try:
 except:
 	gettext.install('nvda',unicode=True)
 
-import pythonMonkeyPatches
-
 import sys
 import os
 import versionInfo
diff --git a/source/oleacc.py b/source/oleacc.py
index eb4b5dc54fb..959d5e649f5 100644
--- a/source/oleacc.py
+++ b/source/oleacc.py
@@ -311,19 +311,14 @@ def AccessibleChildren(pacc,iChildStart,cChildren):
 	return [x.value for x in varChildren[0:pcObtained.value]]
 
 def GetProcessHandleFromHwnd(windowHandle):
-	"""Retreaves a process handle of the process who owns the window.
-	If Windows Vista, uses GetProcessHandleFromHwnd found in oleacc.dll which allows a client with UIAccess to open a process who is elevated.
-	if older than Windows Vista, just uses OpenProcess from user32.dll instead.
+	"""Retrieves a process handle of the process who owns the window.
+	This uses GetProcessHandleFromHwnd found in oleacc.dll which allows a client with UIAccess to open a process that is elevated.
 	@param windowHandle: a window of a process you wish to retreave a process handle for
 	@type windowHandle: integer
 	@returns: a process handle with read, write and operation access
 	@rtype: integer
 	"""
-	try:
-		return oledll.oleacc.GetProcessHandleFromHwnd(windowHandle)
-	except:
-		import winKernel
-		return winKernel.openProcess(winKernel.PROCESS_VM_READ|winKernel.PROCESS_VM_WRITE|winKernel.PROCESS_VM_OPERATION,False,winUser.getWindowThreadProcessID(windowHandle)[0])
+	return oledll.oleacc.GetProcessHandleFromHwnd(windowHandle)
 
 def GetRoleText(role):
 	textLen=oledll.oleacc.GetRoleTextW(role,0,0)
diff --git a/source/pythonMonkeyPatches.py b/source/pythonMonkeyPatches.py
deleted file mode 100644
index 8f7b9a2f089..00000000000
--- a/source/pythonMonkeyPatches.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2013-2017 NV Access Limited
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
-
-"""Fixes some broken features in Python such as gettempdir"""
-
-# #2729: Python's tempfile.get_default_tempdir() has a bug when handling multibyte paths. os.path.normcase is used incorrectly.
-# Override this to use the temp path as returned by Windows.
-import ctypes
-import tempfile
-tempPath = ctypes.create_string_buffer(260)
-if ctypes.windll.kernel32.GetTempPathA(260, tempPath) > 0:
-	# Strip trailing backslash which is always included.
-	tempfile.tempdir = tempPath.value[:-1]
-
-# #6705: ctypes._dlopen (imported from _ctypes.LoadLibrary) doesn't support unicode paths.
-# In Python < 2.7.13, it silently converted them to str, treating them as ASCII.
-# In Python 2.7.13 (Python issue 27330), passing unicode now throws an exception.
-# Some add-ons depend on the previous behaviour, so monkey patch this to support unicode.
-old_dlopen = ctypes._dlopen
-def _dlopen(name, mode=ctypes.DEFAULT_MODE):
-	if isinstance(name, unicode):
-		name = name.encode("mbcs")
-	return old_dlopen(name, mode)
-ctypes._dlopen = _dlopen
diff --git a/source/screenExplorer.py b/source/screenExplorer.py
index 635ee97b47f..53e3b81319b 100644
--- a/source/screenExplorer.py
+++ b/source/screenExplorer.py
@@ -2,6 +2,7 @@
 import tones
 import controlTypes
 import textInfos
+import locationHelper
 import speech
 
 class ScreenExplorer(object):
@@ -42,7 +43,7 @@ def moveTo(self,x,y,new=False,unit=textInfos.UNIT_LINE):
 					hasNewObj=False 
 		if not pos:
 			try:
-				pos=obj.makeTextInfo(textInfos.Point(x,y))
+				pos=obj.makeTextInfo(locationHelper.Point(x,y))
 			except (NotImplementedError,LookupError):
 				pass
 			if pos: pos.expand(unit)
diff --git a/source/setup.py b/source/setup.py
index 06abcba808c..dded378afe0 100755
--- a/source/setup.py
+++ b/source/setup.py
@@ -210,10 +210,6 @@ def getRecursiveDataFiles(dest,source,excludes=()):
 			"bisect",
 			# Also, the previous service executable used win32api, which some add-ons use for various purposes.
 			"win32api",
-			# #8628: include an import module for validate, which older add-ons import directly.
-			# Since configobj 5.1.0, validate is a part of the configobj package
-			# and should be imported as configobj.validate instead
-			"validate",
 		],
 	}},
 	data_files=[
diff --git a/source/synthDriverHandler.py b/source/synthDriverHandler.py
index 094ac215530..a2b35cb2ecf 100644
--- a/source/synthDriverHandler.py
+++ b/source/synthDriverHandler.py
@@ -19,7 +19,6 @@
 import extensionPoints
 import synthDrivers
 import driverHandler
-import warnings
 from driverHandler import StringParameterInfo # Backwards compatibility
 
 _curSynth=None
@@ -140,37 +139,6 @@ def handlePostConfigProfileSwitch(resetSpeechIfNeeded=True):
 		return
 	_curSynth.loadSettings(onlyChanged=True)
 
-class SynthSetting(driverHandler.DriverSetting):
-	"""@Deprecated: use L{driverHandler.DriverSetting} instead.
-	"""
-
-	def __init__(self,name,displayNameWithAccelerator,availableInSynthSettingsRing=True,displayName=None):
-		warnings.warn("synthDriverHandler.SynthSetting is deprecated. Use driverHandler.DriverSetting instead",
-			DeprecationWarning, stacklevel=3)
-		super(SynthSetting,self).__init__(name,displayNameWithAccelerator,availableInSettingsRing=availableInSynthSettingsRing,displayName=displayName)
-		self.name = name
-
-class NumericSynthSetting(driverHandler.NumericDriverSetting):
-	"""@Deprecated: use L{driverHandler.NumericDriverSetting} instead.
-	"""
-
-	def __init__(self,name,displayNameWithAccelerator,availableInSynthSettingsRing=True,minStep=1,normalStep=5,largeStep=10,displayName=None):
-		warnings.warn("synthDriverHandler.NumericSynthSetting is deprecated. Use driverHandler.NumericDriverSetting instead",
-			DeprecationWarning, stacklevel=3)
-		super(NumericSynthSetting,self).__init__(name,displayNameWithAccelerator,availableInSettingsRing=availableInSynthSettingsRing,minStep=minStep,normalStep=normalStep,largeStep=largeStep,displayName=displayName)
-		self.name = name
-
-class BooleanSynthSetting(driverHandler.BooleanDriverSetting):
-	"""@Deprecated: use L{driverHandler.BooleanDriverSetting} instead.
-	"""
-
-	def __init__(self, name, displayNameWithAccelerator, availableInSynthSettingsRing=False,
-		displayName=None, defaultVal=False):
-		warnings.warn("synthDriverHandler.BooleanSynthSetting is deprecated. Use driverHandler.BooleanDriverSetting instead",
-			DeprecationWarning, stacklevel=3)
-		super(BooleanSynthSetting, self).__init__(name,displayNameWithAccelerator,availableInSettingsRing=availableInSynthSettingsRing,displayName=displayName,defaultVal=defaultVal)
-		self.name = name
-
 class SynthDriver(driverHandler.Driver):
 	"""Abstract base synthesizer driver.
 	Each synthesizer driver should be a separate Python module in the root synthDrivers directory containing a SynthDriver class which inherits from this base class.
@@ -189,8 +157,6 @@ class SynthDriver(driverHandler.Driver):
 	L{supportedNotifications} should specify what notifications the synthesizer provides.
 	Currently, the available notifications are L{synthIndexReached} and L{synthDoneSpeaking}.
 	Both of these must be supported.
-	@ivar supportedSettings: The settings supported by the synthesiser.
-	@type supportedSettings: list or tuple of L{SynthSetting}
 	@ivar voice: Unique string identifying the current voice.
 	@type voice: str
 	@ivar availableVoices: The available voices.
@@ -321,28 +287,6 @@ def speak(self,speechSequence):
 			else:
 				log.error("Unknown item in speech sequence: %s"%item)
 
-	def speakText(self, text, index=None):
-		"""Speak some text.
-		This method is deprecated. Instead implement speak.
-		@param text: The chunk of text to speak.
-		@type text: str
-		@param index: An index (bookmark) to associate with this chunk of text, C{None} if no index.
-		@type index: int
-		@note: If C{index} is provided, the C{lastIndex} property should return this index when the synth is speaking this chunk of text.
-		"""
-		raise NotImplementedError
-
-	def speakCharacter(self, character, index=None):
-		"""Speak some character.
-		This method is deprecated. Instead implement speak.
-		@param character: The character to speak.
-		@type character: str
-		@param index: An index (bookmark) to associate with this chunk of speech, C{None} if no index.
-		@type index: int
-		@note: If C{index} is provided, the C{lastIndex} property should return this index when the synth is speaking this chunk of text.
-		"""
-		self.speakText(character,index)
-
 	def cancel(self):
 		"""Silence speech immediately.
 		"""
diff --git a/source/synthDrivers/espeak.py b/source/synthDrivers/espeak.py
index f0f1e83537d..d4019f01851 100644
--- a/source/synthDrivers/espeak.py
+++ b/source/synthDrivers/espeak.py
@@ -11,7 +11,7 @@
 import Queue
 import threading
 import languageHandler
-from synthDriverHandler import SynthDriver, VoiceInfo, BooleanSynthSetting, synthIndexReached, synthDoneSpeaking
+from synthDriverHandler import SynthDriver, VoiceInfo, synthIndexReached, synthDoneSpeaking
 import speech
 from logHandler import log
 from driverHandler import BooleanDriverSetting
diff --git a/source/textInfos/__init__.py b/source/textInfos/__init__.py
index 4497e183436..e0a0364c1f0 100755
--- a/source/textInfos/__init__.py
+++ b/source/textInfos/__init__.py
@@ -16,6 +16,7 @@
 import baseObject
 import config
 import controlTypes
+import locationHelper
 
 class Field(dict):
 	"""Provides information about a piece of text."""
@@ -159,42 +160,6 @@ def __repr__(self):
 POSITION_SELECTION="selection"
 POSITION_ALL="all"
 
-class Point(object):
-	"""Represents a point on the screen.
-	This is used when associating a point on the screen with a piece of text.
-	@Deprecated: use L{locationHelper.Point} instead.
-	"""
-
-	def __init__(self,x,y):
-		"""
-		@param x: the x coordinate
-		@type x: int
-		@param y: The y coordinate
-		@type y: int
-		"""
-		self.x=x
-		self.y=y
-
-class Rect(object):
-	"""Represents a rectangle on the screen.
-	@Deprecated: use L{locationHelper.Rect} instead."""
-
-	def __init__(self, left, top, right, bottom):
-		"""
-		@param left: The x coordinate of the upper left corner of the rectangle.
-		@type left: int
-		@param top: The y coordinate of the upper left corner of the rectangle.
-		@type top: int
-		@param right: The x coordinate of the lower right corner of the rectangle.
-		@type right: int
-		@param bottom: The y coordinate of the lower right corner of the rectangle.
-		@type bottom: int
-		"""
-		self.left = left
-		self.top = top
-		self.right = right
-		self.bottom = bottom
-
 class Bookmark(baseObject.AutoPropertyObject):
 	"""Represents a static absolute position in some text.
 	This is used to construct a L{TextInfo} at an exact previously obtained position.
@@ -459,6 +424,7 @@ def _get_focusableNVDAObjectAtStart(self):
 	def _get_pointAtStart(self):
 		"""Retrieves x and y coordinates corresponding with the textInfo start. It should return Point.
 		The base implementation uses L{boundingRects}.
+		@rtype: L{locationHelper.Point}
 		"""
 		if self.isCollapsed:
 			copy = self.copy()
diff --git a/source/textInfos/offsets.py b/source/textInfos/offsets.py
index c62a83f11b1..7b7b319c2e6 100755
--- a/source/textInfos/offsets.py
+++ b/source/textInfos/offsets.py
@@ -11,7 +11,7 @@
 import NVDAHelper
 import config
 import textInfos
-from locationHelper import RectLTWH
+import locationHelper
 from treeInterceptorHandler import TreeInterceptor
 import api
 from six.moves import range
@@ -231,15 +231,17 @@ def _get_boundingRects(self):
 					# The end offset is in this line
 					inclusiveLineEnd = inclusiveEndOffset
 				rects.append(
-					RectLTWH.fromCollection(
+					locationHelper.RectLTWH.fromCollection(
 						startLocation if lineStart == startOffset else getLocationFromOffset(lineStart),
 						getLocationFromOffset(inclusiveLineEnd)
 					)
 				)
 				offset = inclusiveLineEnd + 1
 		else:
-			if isinstance(startLocation, textInfos.Point):
-				rects.append(RectLTWH.fromPoint(startLocation))
+			if isinstance(startLocation, locationHelper.Point):
+				rects.append(
+					locationHelper.RectLTWH.fromPoint(startLocation)
+				)
 			else:
 				rects.append(startLocation)
 		intersectedRects = []
@@ -364,9 +366,7 @@ def _getBoundingRectFromOffset(self,offset):
 
 	def _getPointFromOffset(self,offset):
 		# Purposely do not catch LookupError or NotImplementedError raised by _getBoundingRectFromOffset.
-		rect = self._getBoundingRectFromOffset(offset)
-		# For backwards compatibility, keep using textInfos.Point instead of locationHelper.Point
-		return textInfos.Point(*rect.center)
+		return self._getBoundingRectFromOffset(offset).center
 
 	def _getOffsetFromPoint(self,x,y):
 		raise NotImplementedError
@@ -385,7 +385,7 @@ def __init__(self,obj,position):
 		"""
 		super(OffsetsTextInfo,self).__init__(obj,position)
 		from NVDAObjects import NVDAObject
-		if isinstance(position,textInfos.Point):
+		if isinstance(position,locationHelper.Point):
 			offset=self._getOffsetFromPoint(position.x,position.y)
 			position=Offsets(offset,offset)
 		elif isinstance(position,NVDAObject):
@@ -438,7 +438,7 @@ def _getUnitOffsets(self,unit,offset):
 
 	def _get_pointAtStart(self):
 		try:
-			return textInfos.Point(*self._getBoundingRectFromOffset(self._startOffset).topLeft)
+			return self._getBoundingRectFromOffset(self._startOffset).topLeft
 		except NotImplementedError:
 			return self._getPointFromOffset(self._startOffset)
 
diff --git a/source/validate.py b/source/validate.py
deleted file mode 100644
index df6daf8c05e..00000000000
--- a/source/validate.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#validate.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2018 NV Access Limited, Babbage B.V., Joseph Lee
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
-
-"""
-Module to provide backwards compatibility with add-ons that use the configobj validate module.
-Add-ons should be changed to use configobj.validate instead.
-"""
-
-from configobj.validate import *
-import warnings
-
-warnings.warn("Importing validate directly is deprecated. Please use configobj.validate instead", DeprecationWarning, stacklevel=2)
diff --git a/source/winConsoleHandler.py b/source/winConsoleHandler.py
index 62d7e74a2d8..c1dbdccd2a5 100755
--- a/source/winConsoleHandler.py
+++ b/source/winConsoleHandler.py
@@ -15,6 +15,7 @@
 import textInfos
 import api
 import config
+import locationHelper
 
 #: How often to check whether the console is dead (in ms).
 CHECK_DEAD_INTERVAL = 100
@@ -196,7 +197,7 @@ def _getPointFromOffset(self,offset):
 		relativeY=(characterY-consoleScreenBufferInfo.srWindow.Top)*characterHeight
 		x=relativeX+screenLeft
 		y=relativeY+screenTop
-		return textInfos.Point(x,y)
+		return locationHelper.Point(x,y)
 
 	def _getCaretOffset(self):
 		consoleScreenBufferInfo=self.consoleScreenBufferInfo
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index e9964047e03..3e0a2955024 100644
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -7,6 +7,14 @@ What's New in NVDA
 
 == Changes for Developers ==
  - Updated pySerial to version 3.4
+- the validate module is now only available from configobj. Code should now do from configobj import validate rather than import validate.
+- textInfos.Point and textInfos.Rect are removed and replaced by locationHelper.Point and locationHelper.RectLTRB, respectively 
+- braille.BrailleHandler._get/set_tether have been removed. use getTether and setTether respectively.
+- config.getConfigDirs has been removed
+- config.ConfigManager.getConfigValidationParameter is removed. A bug in getConfigValidation has been fixed in order for it being able to fully replace getConfigValidationParameter
+- inputCore.InputGesture.logIdentifier property has been removed. Now use inputCore.InputGesture.identifiers[0] instead.
+- speakText and speakCharacter methods on synthDriver objects are no longer supported. this functionality is handled by SynthDriver.speak now.
+- SynthSetting classes in synthDriverHandler have been removed. Now use driverHandler.DriverSetting classes instead.
 
 
 = 2019.3 =