Dbsync update
Cleanup