Removed unused entities