Fix some inheritance redundancy