More cleanup. Almost ready to start updating the DB.