More progress on cleanup