Remove dependency to inheritance plugin