Code cleanup - database package.