Legacy clean-up