attemting to fix timeout store removal bug