Removing unnecessary heritage