Removing more unneeded inherits.