Removing shared. Large scale reorg