Minor dbdeploy code clean-up