Some debugging info cleanup