Removed country specific consumption. Model now solves without linearising