Some more progress on cleanup