fixes for inheritance and not used code remove