Implements #266
Remove debug info #266