I see this section of database code was removed, but don't see that it was replaced by anything anywhere.  Was it just unnecessary?