Got rid of some Fluff

Buy map and pie charts