Remove db calls