Re-organisation cleanup