Removed unnecessary changes from some diffs.

Moved shared variable values to a new file temporarily.