Partial initializedb.py cleanup.