remove one more db call