Remove unused instances
Small reorg