Latest clear-ups