Split out point object, removed unused function.