remove all surfline usage
Merge branch 'master' into gh-pages