Remove some unused entities