Moved some headers around and eliminated some sections we don't need.