Some debugging debris removed.