Bug 752, cleanup