Original class hierarchy removed