Fixed unnecessary inheritance