DB Minor Cleanup