Closes #648: removing debug