Work towards store cleanup to match load