Some more DB tidy up