Removed bin and gen from tracking