Merge "Remove unused code in tempest files"