Merge "Remove dead code in automation's utils"