Merge "Remove leftover code causing trust agent issues"