Cleanup
Jill's latest DB changes