more syncing and cleaning