some clean up and tuning
remove waiting time during lock acquire. not needed