More database cleanup