Remove old struct definition