Merge branch 'release/v0.2.3'
remove unnecesary code