diff --git a/winarea_d2d/debug.c b/winarea_d2d/debug.c
deleted file mode 100644
index ca8e20be..00000000
--- a/winarea_d2d/debug.c
+++ /dev/null
@@ -1,111 +0,0 @@
-// 25 february 2015
-#include "area.h"
-
-// uncomment the following line to enable debug messages
-#define tableDebug
-// uncomment the following line to halt on a debug message
-#define tableDebugStop
-
-#ifdef tableDebug
-
-#include <stdio.h>
-
-HRESULT logLastError(const char *context)
-{
-	DWORD le;
-	WCHAR *msg;
-	BOOL parenthesize = FALSE;
-	BOOL localFreeFailed = FALSE;
-	DWORD localFreeLastError;
-
-	le = GetLastError();
-	fprintf(stderr, "%s: ", context);
-	if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, le, 0, (LPWSTR) (&msg), 0, NULL) != 0) {
-		fprintf(stderr, "%S (", msg);
-		if (LocalFree(msg) != NULL) {
-			localFreeFailed = TRUE;
-			localFreeLastError = GetLastError();
-		}
-		parenthesize = TRUE;
-	}
-	fprintf(stderr, "GetLastError() == %I32u", le);
-	if (parenthesize)
-		fprintf(stderr, ")");
-	if (localFreeFailed)
-		fprintf(stderr, "; local free of system message failed with last error %I32u", localFreeLastError);
-	fprintf(stderr, "\n");
-#ifdef tableDebugStop
-	DebugBreak();
-#endif
-	SetLastError(le);
-	// a function does not have to set a last error
-	// if the last error we get is actually 0, then HRESULT_FROM_WIN32(0) will return S_OK (0 cast to an HRESULT, since 0 <= 0), which we don't want
-	// prevent this by returning E_FAIL, so the rest of the Table code doesn't barge onward
-	if (le == 0)
-		return E_FAIL;
-	return HRESULT_FROM_WIN32(le);
-}
-
-HRESULT logHRESULT(const char *context, HRESULT hr)
-{
-	WCHAR *msg;
-	BOOL parenthesize = FALSE;
-	BOOL localFreeFailed = FALSE;
-	DWORD localFreeLastError;
-
-	fprintf(stderr, "%s: ", context);
-	// this isn't technically documented, but everyone does it, including Microsoft (see the implementation of _com_error::ErrorMessage() in a copy of comdef.h that comes with the Windows DDK)
-	if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, (DWORD) hr, 0, (LPWSTR) (&msg), 0, NULL) != 0) {
-		fprintf(stderr, "%S (", msg);
-		if (LocalFree(msg) != NULL) {
-			localFreeFailed = TRUE;
-			localFreeLastError = GetLastError();
-		}
-		parenthesize = TRUE;
-	}
-	fprintf(stderr, "HRESULT == 0x%I32X", hr);
-	if (parenthesize)
-		fprintf(stderr, ")");
-	if (localFreeFailed)
-		fprintf(stderr, "; local free of system message failed with last error %I32u", localFreeLastError);
-	fprintf(stderr, "\n");
-#ifdef tableDebugStop
-	DebugBreak();
-#endif
-	return hr;
-}
-
-HRESULT logMemoryExhausted(const char *reason)
-{
-	fprintf(stderr, "memory exhausted %s\n", reason);
-#ifdef tableDebugStop
-	DebugBreak();
-#endif
-	return E_OUTOFMEMORY;
-}
-
-#else
-
-HRESULT logLastError(const char *reason)
-{
-	DWORD le;
-
-	le = GetLastError();
-	// we shouldn't need to do this, but let's do this anyway just to be safe
-	SetLastError(le);
-	if (le == 0)
-		return E_FAIL;
-	return HRESULT_FROM_WIN32(le);
-}
-
-HRESULT logHRESULT(const char *reason, HRESULT hr)
-{
-	return hr;
-}
-
-HRESULT logMemoryExhausted(const char *reason)
-{
-	return E_OUTOFMEMORY;
-}
-
-#endif
diff --git a/winarea_d2d/main.c b/winarea_d2d/main.c
deleted file mode 100644
index d7764c5a..00000000
--- a/winarea_d2d/main.c
+++ /dev/null
@@ -1,401 +0,0 @@
-// 4 september 2015
-#define _GNU_SOURCE
-#include "area.h"
-#include <math.h>
-
-// #qo LIBS: user32 kernel32 d2d1 ole32 uuid gdi32 msimg32
-
-struct handler {
-	uiAreaHandler ah;
-};
-
-static HWND area;
-static struct handler h;
-static HWND nhspinb;
-static HWND nvspinb;
-
-static void handlerDraw(uiAreaHandler *a, uiArea *area, uiAreaDrawParams *p)
-{
-	uiDrawPath *path;
-	uiDrawBrush brush;
-	uiDrawStrokeParams sp;
-
-	brush.Type = uiDrawBrushTypeSolid;
-	brush.A = 1;
-
-	brush.R = 1;
-	brush.G = 0;
-	brush.B = 0;
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathNewFigure(path, p->ClipX + 5, p->ClipY + 5);
-	uiDrawPathLineTo(path, (p->ClipX + p->ClipWidth) - 5, (p->ClipY + p->ClipHeight) - 5);
-	uiDrawPathEnd(path);
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinMiter;
-	sp.Thickness = 1;
-	sp.MiterLimit = uiDrawDefaultMiterLimit;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	uiDrawFreePath(path);
-
-	brush.R = 0;
-	brush.G = 0;
-	brush.B = 0.75;
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathNewFigure(path, p->ClipX, p->ClipY);
-	uiDrawPathLineTo(path, p->ClipX + p->ClipWidth, p->ClipY);
-	uiDrawPathLineTo(path, 50, 150);
-	uiDrawPathLineTo(path, 50, 50);
-	uiDrawPathCloseFigure(path);
-	uiDrawPathEnd(path);
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinRound;
-	sp.Thickness = 5;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	uiDrawFreePath(path);
-
-	brush.R = 0;
-	brush.G = 0.75;
-	brush.B = 0;
-	brush.A = 0.5;
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathAddRectangle(path, 120, 80, 50, 50);
-	uiDrawPathEnd(path);
-	uiDrawFill(p->Context, path, &brush);
-	uiDrawFreePath(path);
-	brush.A = 1;
-
-	brush.R = 0;
-	brush.G = 0.5;
-	brush.B = 0;
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathNewFigure(path, 5.5, 10.5);
-	uiDrawPathLineTo(path, 5.5, 50.5);
-	uiDrawPathEnd(path);
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinMiter;
-	sp.Thickness = 1;
-	sp.MiterLimit = uiDrawDefaultMiterLimit;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	uiDrawFreePath(path);
-
-	brush.R = 0.5;
-	brush.G = 0.75;
-	brush.B = 0;
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathNewFigure(path, 400, 100);
-	uiDrawPathArcTo(path,
-		400, 100,
-		50,
-		30. * (M_PI / 180.),
-		// note the end angle here
-		// in GDI, the second angle to AngleArc() is relative to the start, not to 0
-		330. * (M_PI / 180.));
-	// TODO add a checkbox for this
-	uiDrawPathLineTo(path, 400, 100);
-	uiDrawPathNewFigureWithArc(path,
-		510, 100,
-		50,
-		30. * (M_PI / 180.),
-		330. * (M_PI / 180.));
-	uiDrawPathCloseFigure(path);
-	uiDrawPathEnd(path);
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinMiter;
-	sp.Thickness = 1;
-	sp.MiterLimit = uiDrawDefaultMiterLimit;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	uiDrawFreePath(path);
-
-	brush.R = 0;
-	brush.G = 0.5;
-	brush.B = 0.75;
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathNewFigure(path, 300, 300);
-	uiDrawPathBezierTo(path,
-		350, 320,
-		310, 390,
-		435, 372);
-	uiDrawPathEnd(path);
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinMiter;
-	sp.Thickness = 1;
-	sp.MiterLimit = uiDrawDefaultMiterLimit;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	uiDrawFreePath(path);
-
-	// based on https://msdn.microsoft.com/en-us/library/windows/desktop/dd756682%28v=vs.85%29.aspx
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-#define XO 50
-#define YO 250
-	uiDrawPathNewFigure(path, 0 + XO, 0 + YO);
-	uiDrawPathLineTo(path, 200 + XO, 0 + YO);
-	uiDrawPathBezierTo(path,
-		150 + XO, 50 + YO,
-		150 + XO, 150 + YO,
-		200 + XO, 200 + YO);
-	uiDrawPathLineTo(path, 0 + XO, 200 + YO);
-	uiDrawPathBezierTo(path,
-		50 + XO, 150 + YO,
-		50 + XO, 50 + YO,
-		0 + XO, 0 + YO);
-	uiDrawPathCloseFigure(path);
-	uiDrawPathEnd(path);
-	// first the stroke
-	brush.Type = uiDrawBrushTypeSolid;
-	brush.R = 0;
-	brush.G = 0;
-	brush.B = 0;
-	brush.A = 1;
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinMiter;
-	sp.MiterLimit = uiDrawDefaultMiterLimit;
-	sp.Thickness = 10;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	// and now the fill
-	{
-		uiDrawBrushGradientStop stops[2];
-
-		stops[0].Pos = 0.0;
-		stops[0].R = 0.0;
-		stops[0].G = 1.0;
-		stops[0].B = 1.0;
-		stops[0].A = 0.25;
-		stops[1].Pos = 1.0;
-		stops[1].R = 0.0;
-		stops[1].G = 0.0;
-		stops[1].B = 1.0;
-		stops[1].A = 1.0;
-		brush.Type = uiDrawBrushTypeLinearGradient;
-		brush.X0 = 100 + XO;
-		brush.Y0 = 0 + YO;
-		brush.X1 = 100 + XO;
-		brush.Y1 = 200 + YO;
-		brush.Stops = stops;
-		brush.NumStops = 2;
-		uiDrawFill(p->Context, path, &brush);
-	}
-#undef YO
-#undef XO
-	uiDrawFreePath(path);
-
-	// based on https://msdn.microsoft.com/en-us/library/windows/desktop/dd756679%28v=vs.85%29.aspx
-	path = uiDrawNewPath(uiDrawFillModeWinding);
-	uiDrawPathNewFigure(path, 585, 235);
-	uiDrawPathArcTo(path,
-		510, 235,
-		75,
-		0,
-		// TODO why doesn't 360° work
-		2 * M_PI - 0.1);
-	uiDrawPathEnd(path);
-	// first the stroke
-	brush.Type = uiDrawBrushTypeSolid;
-	brush.R = 0;
-	brush.G = 0;
-	brush.B = 0;
-	brush.A = 1;
-	sp.Cap = uiDrawLineCapFlat;
-	sp.Join = uiDrawLineJoinMiter;
-	sp.MiterLimit = uiDrawDefaultMiterLimit;
-	sp.Thickness = 1;
-	uiDrawStroke(p->Context, path, &brush, &sp);
-	// then the fill
-	{
-		uiDrawBrushGradientStop stops[2];
-
-		stops[0].Pos = 0.0;
-		stops[0].R = 1.0;
-		stops[0].G = 1.0;
-		stops[0].B = 0.0;
-		stops[0].A = 1.0;
-		stops[1].Pos = 1.0;
-		stops[1].R = ((double) 0x22) / 255.0;
-		stops[1].G = ((double) 0x8B) / 255.0;
-		stops[1].B = ((double) 0x22) / 255.0;
-		stops[1].A = 1.0;
-		brush.Type = uiDrawBrushTypeRadialGradient;
-		// start point
-		brush.X0 = 510;
-		brush.Y0 = 235;
-		// outer circle's center
-		brush.X1 = 510;
-		brush.Y1 = 235;
-		brush.OuterRadius = 75;
-		brush.Stops = stops;
-		brush.NumStops = 2;
-		uiDrawFill(p->Context, path, &brush);
-	}
-	uiDrawFreePath(path);
-}
-
-static uintmax_t handlerHScrollMax(uiAreaHandler *a, uiArea *area)
-{
-	WCHAR c[50];
-
-	GetWindowTextW(nhspinb, c, 50);
-	return _wtoi(c);
-}
-
-static uintmax_t handlerVScrollMax(uiAreaHandler *a, uiArea *area)
-{
-	WCHAR c[50];
-
-	GetWindowTextW(nvspinb, c, 50);
-	return _wtoi(c);
-}
-
-static int handlerRedrawOnResize(uiAreaHandler *a, uiArea *area)
-{
-	return 1;
-}
-
-static void handlerMouseEvent(uiAreaHandler *a, uiArea *area, uiAreaMouseEvent *e)
-{
-	printf("mouse (%d,%d):(%d,%d) down:%d up:%d count:%d mods:%x held:%I64x\n",
-		(int) e->X,
-		(int) e->Y,
-		(int) e->HScrollPos,
-		(int) e->VScrollPos,
-		(int) e->Down,
-		(int) e->Up,
-		(int) e->Count,
-		(uint32_t) e->Modifiers,
-		e->Held1To64);
-}
-
-static void handlerDragBroken(uiAreaHandler *ah, uiArea *a)
-{
-	printf("drag broken\n");
-}
-
-static int handlerKeyEvent(uiAreaHandler *ah, uiArea *a, uiAreaKeyEvent *e)
-{
-	char k[4];
-
-	k[0] = '\'';
-	k[1] = e->Key;
-	k[2] = '\'';
-	k[3] = '\0';
-	if (e->Key == 0) {
-		k[0] = '0';
-		k[1] = '\0';
-	}
-	printf("key key:%s extkey:%d mod:%d mods:%d up:%d\n",
-		k,
-		(int) e->ExtKey,
-		(int) e->Modifier,
-		(int) e->Modifiers,
-		e->Up);
-	return 0;
-}
-
-static void repos(HWND hwnd)
-{
-	RECT r;
-
-	GetClientRect(hwnd, &r);
-	SetWindowPos(nhspinb, NULL, r.left + 12, r.top + 12,
-		120, 20,
-		SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
-	SetWindowPos(nvspinb, NULL, r.left + 12 + 120 + 6, r.top + 12,
-		120, 20,
-		SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
-	SetWindowPos(area, NULL, r.left + 12, r.top + 12 + 20 + 6,
-		r.right - r.left - 24, r.bottom - r.top - 24 - 20 - 6,
-		SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
-}
-
-static LRESULT CALLBACK wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	WINDOWPOS *wp = (WINDOWPOS *) lParam;
-
-	switch (uMsg) {
-	case WM_COMMAND:
-		if (((HWND) lParam) == nhspinb || ((HWND) lParam) == nvspinb)
-			if (HIWORD(wParam) == EN_CHANGE)
-				areaUpdateScroll(area);
-		break;
-	case WM_WINDOWPOSCHANGED:
-		if ((wp->flags & SWP_NOSIZE) != 0)
-			break;
-		repos(hwnd);
-		return 0;
-	case WM_CLOSE:
-		PostQuitMessage(0);
-	}
-	return DefWindowProcW(hwnd, uMsg, wParam, lParam);
-}
-
-HINSTANCE hInstance;
-
-int main(void)
-{
-	WNDCLASSW wc;
-	HWND mainwin;
-	MSG msg;
-
-	CoInitialize(NULL);
-	initDraw();
-
-	hInstance = GetModuleHandle(NULL);
-
-	h.ah.Draw = handlerDraw;
-	h.ah.HScrollMax = handlerHScrollMax;
-	h.ah.VScrollMax = handlerVScrollMax;
-	h.ah.RedrawOnResize = handlerRedrawOnResize;
-	h.ah.MouseEvent = handlerMouseEvent;
-	h.ah.DragBroken = handlerDragBroken;
-	h.ah.KeyEvent = handlerKeyEvent;
-
-	registerAreaClass();
-
-	ZeroMemory(&wc, sizeof (WNDCLASSW));
-	wc.lpszClassName = L"mainwin";
-	wc.lpfnWndProc = wndproc;
-	wc.hInstance = hInstance;
-	wc.hbrBackground = (HBRUSH) (COLOR_BTNFACE + 1);
-	RegisterClassW(&wc);
-
-	mainwin = CreateWindowExW(0,
-		L"mainwin", L"mainwin",
-		WS_OVERLAPPEDWINDOW,
-		CW_USEDEFAULT, CW_USEDEFAULT,
-		CW_USEDEFAULT, CW_USEDEFAULT,
-		NULL, NULL, hInstance, NULL);
-
-	area = makeArea(0,
-		WS_CHILD | WS_VISIBLE,
-		0, 0, 0, 0,
-		mainwin,
-		(uiAreaHandler *) (&h));
-
-	nhspinb = CreateWindowExW(WS_EX_CLIENTEDGE,
-		L"edit", L"0",
-		ES_NUMBER | WS_CHILD | WS_VISIBLE,
-		0, 0, 100, 100,
-		mainwin, NULL, hInstance, NULL);
-
-	nvspinb = CreateWindowExW(WS_EX_CLIENTEDGE,
-		L"edit", L"0",
-		ES_NUMBER | WS_CHILD | WS_VISIBLE,
-		0, 0, 100, 100,
-		mainwin, NULL, hInstance, NULL);
-
-	// initial state
-	repos(mainwin);
-	areaUpdateScroll(area);
-
-	ShowWindow(mainwin, SW_SHOWDEFAULT);
-	UpdateWindow(mainwin);
-
-	extern BOOL processAreaMessage(MSG *);
-	while (GetMessage(&msg, NULL, 0, 0)) {
-		if (processAreaMessage(&msg)) continue;
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-
-	uninitDraw();
-	CoUninitialize();
-	return 0;
-}