Remove unnecessary heir dependency