removed redundant inheritance layer