Adding defunct DB code for fixing