Merge "Remove unused globals"