Cleanup - update references