remove an unused func
remove unused code
fix the shard boundaries test
introduce some sleeps to make sure the data is updated