Removed unnecessary inheritance