Working on #738 Database optimization
Removing old columns