Updated to remove some heirloom references