Remove unsed code
Merge branch 'master/chiba' into master/chiba2