Merge "Remove typo'd variables"