Cleanups for DB panel