Bug Fixes
Removed _log() calls