removed unnecessary method
remove unnecessary lock
lock on the same object as elsewhere
reolve todo: nope!