Cleanup a lot

- References to ShareType removed etc.