And final cleanup