Cleanup
DN: second half, first draft