Cleaned up inheritance