clean old code
remove assert
Merge remote-tracking branch 'upstream/master' into lock