Bugfixes:
- Removed unnecessary HTTP requests