Removed some unnecessary logging, improved elsewhere
Removed some unnecessary logging, improved elsewhere