#4137 remove unnecessary locks
#4137 tidy all core