removed two undeded db calls