Removing uncessary static block allocations, fixing bug in DataSummary logic