DB model code clean-up