Database changes, and cleanup