Start merging variables

This is my first pass at removing useless variables from the defaults file.