Refreshed cleanup

(need a clean working tree)