removed second db query