Fix lock issue. Remove feature