Removed ifdef, not needed
Removed log
Fixed exception when no editor in place