Remove unneeded inheritance