INTERNAL. legacy cleanup