some work deprecating the database