Update data dump and some small bug fixes
Remove obsolete function