Revert "First shot at new inheritance"

This reverts commit ccd4f1c9bb006b9f9debf72672646b1d4f67c17d.