Remove unnecessary DB call