Cleanup how calcs are added to dataSource