Merge "Remove uses of $USER"