Cleanup so that the thing (kinda sorta) works.