Remove a couple extra configs
Compass patch for Canadian (ehhhhhh) variants from lambgx02