- Add component removal
- Small fixes on Entity ref