DCE and some other minor cleanup