Cleaning up of ZY's CPDBarGraphVC. A LOT more cleaning up remains!