remove redundant code
Merge branch 'experimental'