Some cleanup
DB content fix