And another round of cleanup mainly removing debug statements.