first pass cleanup of guidelines