Removed new database scheme, refactored it into #680