removed db calls