DB changes
cleanup