Cleaned up some of the old commented out db-related stuff.