Use the static db for fuel consumption for POS, tidy up of related code.