Remove SetConfigOption calls and eliminate random whitespace changes