cleanup old code
Merge branch 'wsi-master' of https://github.com/robpointmarc/pointmarc-public into wsi-master