lock lib change and removal of few comments