Some additional changes

* Revert to Core:Call()
- Removed variable