comment out unnecesary function until further notice
Merge branch 'release/v0.13.1' into develop