final clean-up of the elegant mess