Bugfix

Cleanup issues with instances use
Remove debug logging (comment out)