base on 2.2.3
remove samples