remove thread safety check
drop 2 tests
Merge branches 'try1' and 'try2'