Legacy object cleanup