Remove all bad-organised code