First cleanups/changes for the upcoming database changes.