diff --git a/openair2/LAYER2/RLC/TM/COPYING b/openair2/LAYER2/RLC/TM/COPYING
deleted file mode 100644
index 94a9ed024d3859793618152ea559a168bbcbb5e2..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm.c b/openair2/LAYER2/RLC/TM/rlc_tm.c
deleted file mode 100755
index 9501d803bc22e5233384e79bef34b3992b061843..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/***************************************************************************
-                          rlc_tm.c  -
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
- ***************************************************************************/
-#include "platform_types.h"
-//-----------------------------------------------------------------------------
-#include "rlc_tm_entity.h"
-#include "mac_primitives.h"
-#include "rlc_primitives.h"
-#include "rlc_tm_control_primitives_proto_extern.h"
-#include "rlc_tm_segment_proto_extern.h"
-#include "rlc_tm_reassembly_proto_extern.h"
-#include "list.h"
-#include "mem_block.h"
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-void*           rlc_tm_tx (void* arg_pP);
-void            rlc_tm_rx_no_segment (void* arg_pP, struct mac_data_ind data_indP);
-void            rlc_tm_rx_segment (void* arg_pP, struct mac_data_ind data_indP);
-//-----------------------------------------------------------------------------
-void
-rlc_tm_get_pdus (void* arg_pP)
-{
-  //-----------------------------------------------------------------------------
-  struct rlc_tm_entity* rlc = (struct rlc_tm_entity*) arg_pP;
-
-  switch (rlc->protocol_state) {
-  case RLC_NULL_STATE:
-    // from 3GPP TS 25.322 V4.2.0
-    // In the NULL state the RLC entity does not exist and therefore it is not possible to transfer any data through it.
-    // Upon reception of a CRLC-CONFIG-Req from upper layer indicating establishment, the RLC entity:
-    // -      is created; and
-    // -      enters the DATA_TRANSFER_READY state.
-    break;
-
-  case RLC_DATA_TRANSFER_READY_STATE:
-    rlc->segmentation (rlc);
-    break;
-
-  default:
-    msg ("[RLC_TM %p] MAC_DATA_REQ UNKNOWN PROTOCOL STATE %02X hex\n", rlc, rlc->protocol_state);
-  }
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_rx_no_segment (void* arg_pP, struct mac_data_ind data_indP)
-{
-  //-----------------------------------------------------------------------------
-  struct rlc_tm_entity* rlc = (struct rlc_tm_entity*) arg_pP;
-  mem_block_t* tb_p;
-  uint8_t*             first_byte;
-  uint8_t              tb_size_in_bytes;
-  uint8_t              first_bit;
-  uint8_t              bits_to_shift;
-  uint8_t              bits_to_shift_last_loop;
-
-  switch (rlc->protocol_state) {
-  case RLC_NULL_STATE:
-    // from 3GPP TS 25.322 V4.2.0
-    // In the NULL state the RLC entity does not exist and therefore it is not possible to transfer any data through it.
-    // Upon reception of a CRLC-CONFIG-Req from upper layer indicating establishment, the RLC entity:
-    // -      is created; and
-    // -      enters the DATA_TRANSFER_READY state.
-    msg ("[RLC_TM %p] ERROR MAC_DATA_IND IN RLC_NULL_STATE\n", arg_pP);
-    list_free (&data_indP.data);
-    break;
-
-  case RLC_DATA_TRANSFER_READY_STATE:
-    rlc->output_sdu_size_to_write = 0;      // size of sdu reassemblied
-
-    while ((tb_p = list_remove_head (&data_indP.data))) {
-      first_byte = ((struct mac_tb_ind*) (tb_p->data))->data_ptr;
-      tb_size_in_bytes = (data_indP.tb_size + 7) >> 3;
-      first_bit = ((struct mac_tb_ind*) (tb_p->data))->first_bit;
-
-      if (first_bit > 0) {
-        // shift data of transport_block TO CHECK
-        bits_to_shift_last_loop = 0;
-        first_byte[tb_size_in_bytes] &= (0xFF << (8 - first_bit));
-
-        while ((tb_size_in_bytes)) {
-          bits_to_shift = first_byte[tb_size_in_bytes - 1] >> (8 - first_bit);
-          first_byte[tb_size_in_bytes - 1] = (first_byte[tb_size_in_bytes - 1] << first_bit) | (bits_to_shift_last_loop);
-          tb_size_in_bytes -= 1;
-          bits_to_shift_last_loop = bits_to_shift;
-        }
-      }
-
-      ((struct rlc_tm_rx_pdu_management*) (tb_p->data))->first_byte = first_byte;
-
-      if (rlc->delivery_of_erroneous_sdu == RLC_TM_DELIVERY_OF_ERRONEOUS_SDU_NO_DETECT) {
-        rlc_tm_send_sdu_no_segment (rlc, 0, first_byte, data_indP.tb_size);
-
-      } else if (rlc->delivery_of_erroneous_sdu == RLC_TM_DELIVERY_OF_ERRONEOUS_SDU_YES) {
-        rlc_tm_send_sdu_no_segment (rlc, (((struct mac_tb_ind*) (tb_p->data))->error_indication), first_byte, data_indP.tb_size);
-
-      } else {              //RLC_TM_DELIVERY_OF_ERRONEOUS_SDU_NO
-        if (!(((struct mac_tb_ind*) (tb_p->data))->error_indication)) {
-          rlc_tm_send_sdu_no_segment (rlc, 0, first_byte, data_indP.tb_size);
-        }
-      }
-
-      free_mem_block (tb_p);
-    }
-
-    break;
-
-  default:
-    msg ("[rlc_tm %p] TX UNKNOWN PROTOCOL STATE %02X hex\n", rlc, rlc->protocol_state);
-  }
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_rx_segment (void* arg_pP, struct mac_data_ind data_indP)
-{
-  //-----------------------------------------------------------------------------
-  struct rlc_tm_entity* rlc             = (struct rlc_tm_entity_s*) arg_pP;
-  mem_block_t*          tb_p            = NULL;
-  sdu_size_t            tb_size_in_bits = 0;
-  uint8_t*                 first_byte_p    = NULL;
-  uint8_t                  error_in_sdu    = 0;
-  sdu_size_t            tb_size_in_bytes= 0;
-  uint8_t                  first_bit       = 0;
-  uint8_t                  byte            = 0;
-  //just for debug
-  uint8_t*                 debug           = NULL;
-
-  switch (rlc->protocol_state) {
-  case RLC_NULL_STATE:
-    // from 3GPP TS 25.322 V4.2.0
-    // In the NULL state the RLC entity does not exist and therefore it is not possible to transfer any data through it.
-    // Upon reception of a CRLC-CONFIG-Req from upper layer indicating establishment, the RLC entity:
-    // -      is created; and
-    // -      enters the DATA_TRANSFER_READY state.
-    msg ("[RLC_TM %p] ERROR MAC_DATA_IND IN RLC_NULL_STATE\n", arg_pP);
-    list_free (&data_indP.data);
-    break;
-
-  case RLC_DATA_TRANSFER_READY_STATE:
-    rlc->output_sdu_size_to_write = 0;      // size of sdu reassemblied
-
-    switch (rlc->delivery_of_erroneous_sdu) {
-    case RLC_TM_DELIVERY_OF_ERRONEOUS_SDU_NO_DETECT:
-      break;
-
-    case RLC_TM_DELIVERY_OF_ERRONEOUS_SDU_YES:
-      error_in_sdu = 0;
-
-      while ((tb_p = list_remove_head (&data_indP.data))) {
-        if ((((struct mac_tb_ind*) (tb_p->data))->error_indication)) {
-          error_in_sdu = 1;
-        }
-      }
-
-      break;
-
-    case RLC_TM_DELIVERY_OF_ERRONEOUS_SDU_NO:
-      error_in_sdu = 0;
-
-      if (rlc->output_sdu_in_construction == NULL) {
-        rlc->output_sdu_in_construction = get_free_mem_block (RLC_SDU_MAX_SIZE_DATA_PLANE);
-        rlc->output_sdu_size_to_write = 0;
-        rlc->last_bit_position_reassemblied = 0;
-      }
-
-      debug = (uint8_t*)&rlc->output_sdu_in_construction->data[0];
-
-      while ((tb_p = list_remove_head (&data_indP.data))) {
-        if ((((struct mac_tb_ind*) (tb_p->data))->error_indication) && (error_in_sdu)) {
-          error_in_sdu = 1;
-
-        } else {
-          first_byte = ((struct mac_tb_ind*) (tb_p->data))->data_ptr;
-          tb_size_in_bytes = (data_indP.tb_size + 7) >> 3;
-          tb_size_in_bits = data_indP.tb_size;
-          first_bit = ((struct mac_tb_ind*) (tb_p->data))->first_bit;
-
-          while (tb_size_in_bits > 0) {
-            if ((first_bit == 0) && (rlc->last_bit_position_reassemblied == 0)) {
-              memcpy (&rlc->output_sdu_in_construction->data[rlc->output_sdu_size_to_write >> 3], first_byte, tb_size_in_bytes);
-              rlc->output_sdu_size_to_write += tb_size_in_bits;
-              rlc->last_bit_position_reassemblied = rlc->output_sdu_size_to_write & 0x07;
-
-              if ((rlc->last_bit_position_reassemblied)) {
-                rlc->output_sdu_in_construction->data[(rlc->output_sdu_size_to_write) >> 3] &= (0xFF << (8 - rlc->last_bit_position_reassemblied));
-              }
-
-              tb_size_in_bits = 0;
-
-            } else {
-              if (rlc->last_bit_position_reassemblied == 0) {
-                byte = first_byte[0];
-                rlc->output_sdu_in_construction->data[((rlc->output_sdu_size_to_write + 7) >> 3) ]
-                  = (byte & (0xFF >> first_bit)) << first_bit;
-                rlc->output_sdu_size_to_write += 8 - first_bit;
-                rlc->last_bit_position_reassemblied = rlc->output_sdu_size_to_write & 0x07;
-                tb_size_in_bits -= (8 - first_bit);
-                first_bit = 0;
-                first_byte += 1;
-
-              } else if (first_bit == 0) {
-                byte = first_byte[0];
-                rlc->output_sdu_in_construction->data[((rlc->output_sdu_size_to_write) >> 3) ]
-                |= (byte >> rlc->last_bit_position_reassemblied);
-
-                if ((8 - rlc->last_bit_position_reassemblied) < tb_size_in_bits) {
-                  rlc->output_sdu_size_to_write += (8 - rlc->last_bit_position_reassemblied);
-
-                } else {
-                  rlc->output_sdu_size_to_write += tb_size_in_bits;
-                }
-
-                first_bit = 8 - rlc->last_bit_position_reassemblied;
-                tb_size_in_bits -= (8 - rlc->last_bit_position_reassemblied);
-                rlc->last_bit_position_reassemblied = rlc->output_sdu_size_to_write & 0x07;
-                // NEVER GO IN THAT BLOCK
-
-              } else if ((rlc->last_bit_position_reassemblied <= first_bit) && (rlc->last_bit_position_reassemblied > 0)) {
-                byte = first_byte[0];
-                rlc->output_sdu_in_construction->data[((rlc->output_sdu_size_to_write + 7) >> 3)]
-                |= ((byte & (0xFF >> first_bit)) << (first_bit - rlc->last_bit_position_reassemblied));
-                rlc->output_sdu_size_to_write += (8 - first_bit);
-                rlc->last_bit_position_reassemblied = rlc->output_sdu_size_to_write & 0x07;
-                tb_size_in_bits -= (8 - first_bit);
-                first_bit = 0;
-                first_byte += 1;
-                // now the case is  last_bit_position_reassemblied != 0 &&  first_bit = 0
-                // NEVER GO IN THAT BLOCK
-
-              } else if ((rlc->last_bit_position_reassemblied > first_bit) && (rlc->last_bit_position_reassemblied > 0)) {
-                byte = first_byte[0];
-                rlc->output_sdu_in_construction->data[((rlc->output_sdu_size_to_write + 7) >> 3)]
-                |= ((byte >> (rlc->last_bit_position_reassemblied - first_bit)) & (0xFF >> rlc->last_bit_position_reassemblied));
-                rlc->output_sdu_size_to_write += (8 - rlc->last_bit_position_reassemblied);
-                first_bit = first_bit - (8 - rlc->last_bit_position_reassemblied);
-                tb_size_in_bits -= (8 - rlc->last_bit_position_reassemblied);
-                rlc->last_bit_position_reassemblied = rlc->output_sdu_size_to_write & 0x07;
-                // now the case is  last_bit_position_reassemblied = 0 &&  first_bit != 0
-              }
-            }
-          }
-        }
-
-        free_mem_block (tb_p);
-      }
-
-      if (!(error_in_sdu)) {
-        rlc_tm_send_sdu_segment (rlc, 0);
-      }
-
-      break;
-
-    default:
-      ;
-    }
-
-    break;                  //RLC_DATA_TRANSFER_READY_STATE
-
-  default:
-    msg ("[rlc_tm %p] TX UNKNOWN PROTOCOL STATE %02X hex\n", rlc, rlc->protocol_state);
-  }
-}
-
-//-----------------------------------------------------------------------------
-struct mac_status_resp
-rlc_tm_mac_status_indication (void* rlcP, uint16_t tb_sizeP, struct mac_status_ind tx_statusP)
-{
-  //-----------------------------------------------------------------------------
-  struct mac_status_resp status_resp;
-  ((struct rlc_tm_entity*) rlcP)->nb_pdu_requested_by_mac = 1;
-  ((struct rlc_tm_entity*) rlcP)->rlc_pdu_size = tb_sizeP;
-  status_resp.buffer_occupancy_in_bytes = ((struct rlc_tm_entity*) rlcP)->buffer_occupancy;
-  status_resp.buffer_occupancy_in_pdus = status_resp.buffer_occupancy_in_bytes / ((struct rlc_tm_entity*) rlcP)->rlc_pdu_size;
-  status_resp.rlc_info.rlc_protocol_state = ((struct rlc_tm_entity*) rlcP)->protocol_state;
-  return status_resp;
-}
-
-//-----------------------------------------------------------------------------
-struct mac_data_req
-rlc_tm_mac_data_request (void* rlcP)
-{
-  //-----------------------------------------------------------------------------
-  struct mac_data_req data_req;
-  rlc_tm_get_pdus (rlcP);
-  list_init (&data_req.data, NULL);
-  list_add_list (&((struct rlc_tm_entity*) rlcP)->pdus_to_mac_layer, &data_req.data);
-  data_req.buffer_occupancy_in_bytes = ((struct rlc_tm_entity*) rlcP)->buffer_occupancy;
-  data_req.buffer_occupancy_in_pdus = data_req.buffer_occupancy_in_bytes / ((struct rlc_tm_entity*) rlcP)->rlc_pdu_size;
-  data_req.rlc_info.rlc_protocol_state = ((struct rlc_tm_entity*) rlcP)->protocol_state;
-  ((struct rlc_tm_entity*) rlcP)->last_tti = *((struct rlc_tm_entity*) rlcP)->frame_tick_milliseconds;
-  return data_req;
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_mac_data_indication (void* rlcP, struct mac_data_ind data_indP)
-{
-  //-----------------------------------------------------------------------------
-  ((struct rlc_tm_entity*) rlcP)->rx (rlcP, data_indP);
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_data_req (void* rlcP, mem_block_t* sduP)
-{
-  //-----------------------------------------------------------------------------
-  struct rlc_tm_entity* rlc = (struct rlc_tm_entity*) rlcP;
-  uint8_t              discard_go_on;
-#ifdef DEBUG_RLC_TM_DATA_REQUEST
-  msg ("[RLC_TM %p] RLC_TM_DATA_REQ size %d Bytes, BO %ld , NB SDU %d current_sdu_index=%d next_sdu_index=%d\n", rlc,
-       ((struct rlc_um_data_req*) (sduP->data))->data_size, rlc->buffer_occupancy, rlc->nb_sdu, rlc->current_sdu_index, rlc->next_sdu_index);
-#endif
-
-  // From 3GPP TS 25.322 V4.2.0
-  // If SDU discard has not been configured for a transparent mode RLC entity, the Sender shall upon reception
-  // of new SDUs from upper layer:
-  // -  discard all SDUs received from upper layer in previous TTIs that are not yet submitted to lower layer;
-  // -  submit the new SDUs in the first possible TTI.
-  if ((rlc->sdu_discard_mode & RLC_SDU_DISCARD_NOT_CONFIGURED)) {
-    discard_go_on = 1;
-
-    while ((rlc->input_sdus[rlc->current_sdu_index]) && discard_go_on) {
-      if (rlc->last_tti >= ((struct rlc_tm_tx_sdu_management*) (rlc->input_sdus[rlc->current_sdu_index]->data))->sdu_creation_time) {
-#ifdef DEBUG_RLC_TM_DISCARD_SDU
-        msg ("[RLC_TM %p] SDU DISCARDED NOT SUBMITTED IN THIS TTI %ld ms > ", rlc, rlc->last_tti);
-        msg ("%ld ms ", ((struct rlc_tm_tx_sdu_management*) (rlc->input_sdus[rlc->current_sdu_index]->data))->sdu_creation_time);
-        msg ("BO %d, NB SDU %d\n", rlc->buffer_occupancy, rlc->nb_sdu);
-#endif
-        rlc->nb_sdu -= 1;
-
-        if (!(rlc->segmentation_indication & RLC_TM_SEGMENTATION_ALLOWED)) {
-          rlc->buffer_occupancy -= ((struct rlc_tm_tx_sdu_management*) (rlc->input_sdus[rlc->current_sdu_index]->data))->sdu_size;
-        }
-
-        free_mem_block (rlc->input_sdus[rlc->current_sdu_index]);
-        rlc->input_sdus[rlc->current_sdu_index] = NULL;
-        rlc->current_sdu_index = (rlc->current_sdu_index + 1) % rlc->size_input_sdus_buffer;
-
-      } else {
-        discard_go_on = 0;
-      }
-    }
-  }
-
-  // not in 3GPP specification but the buffer may be full if not correctly configured
-  if (rlc->input_sdus[rlc->next_sdu_index] == NULL) {
-    ((struct rlc_tm_tx_sdu_management*) (sduP->data))->sdu_size = ((struct rlc_tm_data_req*) (sduP->data))->data_size;
-
-    if ((rlc->segmentation_indication & RLC_TM_SEGMENTATION_ALLOWED)) {
-      rlc->buffer_occupancy = ((struct rlc_tm_tx_sdu_management*) (sduP->data))->sdu_size >> 3;
-
-    } else {
-      rlc->buffer_occupancy += (((struct rlc_tm_tx_sdu_management*) (sduP->data))->sdu_size >> 3);
-    }
-
-    rlc->nb_sdu += 1;
-    ((struct rlc_tm_tx_sdu_management*) (sduP->data))->first_byte = (uint8_t*)&sduP->data[sizeof (struct rlc_tm_data_req_alloc)];
-    ((struct rlc_tm_tx_sdu_management*) (sduP->data))->sdu_segmented_size = 0;
-    ((struct rlc_tm_tx_sdu_management*) (sduP->data))->sdu_creation_time = *rlc->frame_tick_milliseconds;
-    rlc->input_sdus[rlc->next_sdu_index] = sduP;
-    rlc->next_sdu_index = (rlc->next_sdu_index + 1) % rlc->size_input_sdus_buffer;
-
-  } else {
-    free_mem_block (sduP);
-  }
-}
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_constants.h b/openair2/LAYER2/RLC/TM/rlc_tm_constants.h
deleted file mode 100755
index 8f0aa1b0509b773c8ad7b483306357b3e405e50d..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_constants.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_constants.h
-* \brief This file defines constant values used in RLC TM.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_CONSTANT_H__
-#        define __RLC_TM_CONSTANT_H__
-//----------------------------------------------------------
-// Events defined for state model of the acknowledged mode entity
-#        define RLC_TM_RECEIVE_CRLC_CONFIG_REQ_ENTER_NULL_STATE_EVENT                 0x00
-#        define RLC_TM_RECEIVE_CRLC_CONFIG_REQ_ENTER_DATA_TRANSFER_READY_STATE_EVENT  0x01
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_control_primitives.c b/openair2/LAYER2/RLC/TM/rlc_tm_control_primitives.c
deleted file mode 100755
index 40aaa339b23097fef0c2016ecb0b33f8be71f83c..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_control_primitives.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/***************************************************************************
-                          rlc_tm_control_primitives.c  -
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
- ***************************************************************************/
-//#include "rtos_header.h"
-#include "platform_types.h"
-//-----------------------------------------------------------------------------
-#include "rlc_tm_entity.h"
-#include "rlc_primitives.h"
-#include "rlc_tm_fsm_proto_extern.h"
-#include "rlc_tm_segment_proto_extern.h"
-#include "rlc_tm_proto_extern.h"
-#include "list.h"
-#include "mem_block.h"
-#include "rrm_config_structs.h"
-//-----------------------------------------------------------------------------
-void            config_req_rlc_tm (struct rlc_tm_entity *rlcP, module_id_t module_idP, rlc_tm_info_t * config_tmP, rb_id_t rb_idP, rb_type_t rb_typeP);
-void            send_rlc_tm_control_primitive (struct rlc_tm_entity *rlcP, module_id_t module_idP, mem_block_t *cprimitiveP);
-void            init_rlc_tm (struct rlc_tm_entity *rlcP);
-void            rlc_tm_reset_state_variables (struct rlc_tm_entity *rlcP);
-void            rlc_tm_free_all_resources (struct rlc_tm_entity *rlcP);
-void            rlc_tm_set_configured_parameters (struct rlc_tm_entity *rlcP, mem_block_t *cprimitiveP);
-//-----------------------------------------------------------------------------
-void
-config_req_rlc_tm (struct rlc_tm_entity *rlcP, module_id_t module_idP, rlc_tm_info_t * config_tmP, rb_id_t rb_idP, rb_type_t rb_typeP)
-{
-  //-----------------------------------------------------------------------------
-  mem_block_t *mb;
-
-  mb = get_free_mem_block (sizeof (struct crlc_primitive));
-  ((struct crlc_primitive *) mb->data)->type = CRLC_CONFIG_REQ;
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.e_r = RLC_E_R_ESTABLISHMENT;
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.timer_discard = config_tmP->timer_discard;
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.sdu_discard_mode = config_tmP->sdu_discard_mode;
-#warning frame_tick_milliseconds
-#ifdef NODE_RG
-  //((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.frame_tick_milliseconds = &protocol_bs->frame_tick_milliseconds;
-#else
-  //((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.frame_tick_milliseconds = &protocol_ms->frame_tick_milliseconds;
-#endif
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.segmentation_indication = config_tmP->segmentation_indication;
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.delivery_of_erroneous_sdu = config_tmP->delivery_of_erroneous_sdu;
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.size_input_sdus_buffer = 128;
-  ((struct crlc_primitive *) mb->data)->primitive.c_config_req.parameters.tm_parameters.rb_id = rb_idP;
-  send_rlc_tm_control_primitive (rlcP, module_idP, mb);
-
-  if (rb_typeP != SIGNALLING_RADIO_BEARER) {
-    rlcP->data_plane = 1;
-  } else {
-    rlcP->data_plane = 0;
-  }
-}
-
-//-----------------------------------------------------------------------------
-void
-send_rlc_tm_control_primitive (struct rlc_tm_entity *rlcP, module_id_t module_idP, mem_block_t *cprimitiveP)
-{
-  //-----------------------------------------------------------------------------
-  switch (((struct crlc_primitive *) cprimitiveP->data)->type) {
-
-  case CRLC_CONFIG_REQ:
-    rlcP->module_id = module_idP;
-
-    switch (((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.e_r) {
-
-    case RLC_E_R_ESTABLISHMENT:
-      if (rlc_tm_fsm_notify_event (rlcP, RLC_TM_RECEIVE_CRLC_CONFIG_REQ_ENTER_DATA_TRANSFER_READY_STATE_EVENT)) {
-        rlc_tm_set_configured_parameters (rlcP, cprimitiveP);   // the order of the calling of procedures...
-        rlc_tm_reset_state_variables (rlcP);    // ...must not ...
-      }
-
-      break;
-
-    case RLC_E_R_RELEASE:
-      if (rlc_tm_fsm_notify_event (rlcP, RLC_TM_RECEIVE_CRLC_CONFIG_REQ_ENTER_NULL_STATE_EVENT)) {
-        rlc_tm_free_all_resources (rlcP);
-      }
-
-      break;
-
-    default:
-      msg ("[RLC_TM][ERROR] send_rlc_tm_control_primitive(CRLC_CONFIG_REQ) unknown parameter E_R\n");
-    }
-
-    break;
-
-  default:
-    msg ("[RLC_TM %p][ERROR] send_rlc_tm_control_primitive(UNKNOWN CPRIMITIVE)\n", rlcP);
-  }
-
-  free_mem_block (cprimitiveP);
-}
-
-//-----------------------------------------------------------------------------
-void
-init_rlc_tm (struct rlc_tm_entity *rlcP)
-{
-  //-----------------------------------------------------------------------------
-
-  memset (rlcP, 0, sizeof (struct rlc_tm_entity));
-  list_init (&rlcP->pdus_to_mac_layer, NULL);
-  list_init (&rlcP->pdus_from_mac_layer, NULL);
-  rlcP->protocol_state = RLC_NULL_STATE;
-  rlcP->nb_sdu = 0;
-  rlcP->next_sdu_index = 0;
-  rlcP->current_sdu_index = 0;
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_reset_state_variables (struct rlc_tm_entity *rlcP)
-{
-  //-----------------------------------------------------------------------------
-  rlcP->output_sdu_size_to_write = 0;
-  rlcP->buffer_occupancy = 0;
-  rlcP->nb_sdu = 0;
-  rlcP->next_sdu_index = 0;
-  rlcP->current_sdu_index = 0;
-  rlcP->last_tti = 0xFFFFFFFF;
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_free_all_resources (struct rlc_tm_entity *rlcP)
-{
-  //-----------------------------------------------------------------------------
-  int             index;
-
-  list_free (&rlcP->pdus_to_mac_layer);
-  list_free (&rlcP->pdus_from_mac_layer);
-
-  if (rlcP->input_sdus_alloc) {
-    for (index = 0; index < rlcP->size_input_sdus_buffer; index++) {
-      if ((rlcP->input_sdus[index])) {
-        free_mem_block (rlcP->input_sdus[index]);
-      }
-    }
-
-    free_mem_block (rlcP->input_sdus_alloc);
-    rlcP->input_sdus_alloc = NULL;
-  }
-
-  if ((rlcP->output_sdu_in_construction)) {
-    free_mem_block (rlcP->output_sdu_in_construction);
-  }
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_set_configured_parameters (struct rlc_tm_entity *rlcP, mem_block_t *cprimitiveP)
-{
-  //-----------------------------------------------------------------------------
-  // timers
-  rlcP->timer_discard_init = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.timer_discard;
-
-  // protocol_parameters
-  rlcP->sdu_discard_mode = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.sdu_discard_mode;
-  rlcP->segmentation_indication = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.segmentation_indication;
-  rlcP->delivery_of_erroneous_sdu = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.delivery_of_erroneous_sdu;
-  // SPARE : not 3GPP
-  rlcP->frame_tick_milliseconds = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.frame_tick_milliseconds;
-  rlcP->size_input_sdus_buffer = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.size_input_sdus_buffer;
-  rlcP->rb_id = ((struct crlc_primitive *) cprimitiveP->data)->primitive.c_config_req.parameters.tm_parameters.rb_id;
-
-  if ((rlcP->input_sdus_alloc == NULL) && (rlcP->size_input_sdus_buffer > 0)) {
-    rlcP->input_sdus_alloc = get_free_mem_block (rlcP->size_input_sdus_buffer * sizeof (void *));
-    rlcP->input_sdus = (mem_block_t **) (rlcP->input_sdus_alloc->data);
-    memset (rlcP->input_sdus, 0, rlcP->size_input_sdus_buffer * sizeof (void *));
-  }
-
-  if (rlcP->segmentation_indication == RLC_TM_SEGMENTATION_ALLOWED) {
-    rlcP->segmentation = rlc_tm_segment;
-    rlcP->rx = rlc_tm_rx_segment;
-  } else {
-    rlcP->segmentation = rlc_tm_no_segment;
-    rlcP->rx = rlc_tm_rx_no_segment;
-  }
-}
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_control_primitives_proto_extern.h b/openair2/LAYER2/RLC/TM/rlc_tm_control_primitives_proto_extern.h
deleted file mode 100755
index 2f291498e676f7f0e52c871e1563aa15dd51f78a..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_control_primitives_proto_extern.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_control_primitives_proto_extern.h
-* \brief This file defines the prototypes of the functions dealing with the control primitives and initialization.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_CONTROL_PRIMITIVES_H__
-#        define __RLC_TM_CONTROL_PRIMITIVES_H__
-//-----------------------------------------------------------------------------
-#        include "rlc_tm_entity.h"
-#        include "mem_block.h"
-#        include "rrm_config_structs.h"
-//-----------------------------------------------------------------------------
-extern void     config_req_rlc_tm (struct rlc_tm_entity *rlcP, module_id_t module_idP,rlc_tm_info_t * config_tmP, rb_id_t rb_idP, rb_type_t rb_typeP);
-extern void     send_rlc_tm_control_primitive (struct rlc_tm_entity *rlcP, module_id_t module_idP, mem_block_t *cprimitiveP);
-extern void     init_rlc_tm (struct rlc_tm_entity *rlcP);
-extern void     rlc_tm_reset_state_variables (struct rlc_tm_entity *rlcP);
-extern void     rlc_tm_free_all_resources (struct rlc_tm_entity *rlcP);
-extern void     rlc_tm_set_configured_parameters (struct rlc_tm_entity *rlcP, mem_block_t *cprimitiveP);
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_entity.h b/openair2/LAYER2/RLC/TM/rlc_tm_entity.h
deleted file mode 100755
index d04bbed374178da5cdb31392129e09e2380c4f00..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_entity.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_entity.h
-* \brief This file defines the RLC TM variables stored in a struct called rlc_tm_entity_t.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_ENTITY_H__
-#        define __RLC_TM_ENTITY_H__
-//-----------------------------------------------------------------------------
-#        include "platform_types.h"
-#        include "platform_constants.h"
-#        include "rlc_tm_structs.h"
-#        include "rlc_def.h"
-//-----------------------------------------------------------------------------
-struct rlc_tm_entity {
-
-  module_id_t     module_id;
-  uint8_t              allocation;
-  uint8_t              protocol_state;
-  // for stats and trace purpose :
-  uint16_t             data_plane;   // act as a boolean
-  uint16_t              rb_id;
-  //-----------------------------
-  // discard info
-  //-----------------------------
-  uint8_t              sdu_discard_mode;
-  //-----------------------------
-  // time
-  //-----------------------------
-  uint16_t             timer_discard_init;
-  uint32_t            *frame_tick_milliseconds;      // pointer on this tick variable handled by RRC : READ ONLY
-  int32_t             last_tti;
-  //-----------------------------
-  // tranmission
-  //-----------------------------
-  // sdu communication;
-  mem_block_t   **input_sdus;   // should be accessed as an array
-  mem_block_t    *input_sdus_alloc;     // allocation of the array
-  uint16_t             size_input_sdus_buffer;
-  uint16_t             nb_sdu;
-  void            (*segmentation) (struct rlc_tm_entity * rlcP);
-
-  uint16_t             next_sdu_index;       // next location of incoming sdu
-  uint16_t             current_sdu_index;
-
-  list_t          pdus_to_mac_layer;
-
-  uint16_t             rlc_pdu_size;
-  uint16_t             nb_pdu_requested_by_mac;
-  uint8_t              segmentation_indication;
-  uint8_t              delivery_of_erroneous_sdu;
-  uint32_t             buffer_occupancy;
-  //-----------------------------
-  // receiver
-  //-----------------------------
-  unsigned int    output_sdu_size_to_write;     // for writing in sdu
-  mem_block_t    *output_sdu_in_construction;
-  void            (*rx) (void *argP, struct mac_data_ind data_indP);
-  uint8_t              last_bit_position_reassemblied;
-
-
-  list_t          pdus_from_mac_layer;
-
-  //-----------------------------
-  // C-SAP
-  //-----------------------------
-  list_t          c_sap;
-  //-----------------------------
-  // Mapping info
-  //-----------------------------
-  uint8_t              logical_channel_identity;
-};
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_fsm.c b/openair2/LAYER2/RLC/TM/rlc_tm_fsm.c
deleted file mode 100755
index 214a3725547b6134f47da69f16e39467ad1cc39d..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_fsm.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/***************************************************************************
-                          rlc_tm_fsm.c  -
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
- ***************************************************************************/
-#include "platform_types.h"
-//-----------------------------------------------------------------------------
-#include "rlc_tm_entity.h"
-#include "rlc_tm_constants.h"
-#include "rlc_def.h"
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-int
-rlc_tm_fsm_notify_event (struct rlc_tm_entity *rlcP, uint8_t eventP)
-{
-  //-----------------------------------------------------------------------------
-
-  switch (rlcP->protocol_state) {
-    //-------------------------------
-    // RLC_NULL_STATE
-    //-------------------------------
-  case RLC_NULL_STATE:
-    switch (eventP) {
-    case RLC_TM_RECEIVE_CRLC_CONFIG_REQ_ENTER_DATA_TRANSFER_READY_STATE_EVENT:
-#ifdef DEBUG_RLC_TM_FSM
-      msg ("[RLC_TM %p][FSM] RLC_NULL_STATE -> RLC_DATA_TRANSFER_READY_STATE\n", rlcP);
-#endif
-      rlcP->protocol_state = RLC_DATA_TRANSFER_READY_STATE;
-      return 1;
-      break;
-
-    default:
-      msg ("[RLC_TM %p][FSM] WARNING PROTOCOL ERROR - EVENT %02X hex NOT EXPECTED FROM NULL_STATE\n", rlcP, eventP);
-      return 0;
-    }
-
-    break;
-
-    //-------------------------------
-    // RLC_DATA_TRANSFER_READY_STATE
-    //-------------------------------
-  case RLC_DATA_TRANSFER_READY_STATE:
-    switch (eventP) {
-    case RLC_TM_RECEIVE_CRLC_CONFIG_REQ_ENTER_NULL_STATE_EVENT:
-#ifdef DEBUG_RLC_TM_FSM
-      msg ("[RLC_TM %p][FSM] RLC_DATA_TRANSFER_READY_STATE -> RLC_NULL_STATE\n", rlcP);
-#endif
-      rlcP->protocol_state = RLC_NULL_STATE;
-      return 1;
-      break;
-    }
-
-    break;
-
-  default:
-    msg ("[RLC_TM %p][FSM] ERROR UNKNOWN STATE %d\n", rlcP, rlcP->protocol_state);
-    return 0;
-  }
-
-  return 0;
-}
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_fsm_proto_extern.h b/openair2/LAYER2/RLC/TM/rlc_tm_fsm_proto_extern.h
deleted file mode 100755
index a9e80e7954a7a5f4dba8333e6be5bd9b979b0a47..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_fsm_proto_extern.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_fsm_proto_extern.h
-* \brief This file defines the prototypes of the functions dealing with the finite state machine of the RLC TM protocol instance.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_FSM_H__
-#        define __RLC_TM_FSM_H__
-//-----------------------------------------------------------------------------
-#        include "platform_types.h"
-#        include "rlc_tm_entity.h"
-//-----------------------------------------------------------------------------
-extern int      rlc_tm_fsm_notify_event (struct rlc_tm_entity *rlcP, uint8_t eventP);
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_proto_extern.h b/openair2/LAYER2/RLC/TM/rlc_tm_proto_extern.h
deleted file mode 100755
index bef0ca34a08bc2beebfcc0a04253b19c6e6a256c..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_proto_extern.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-#    ifndef __RLC_TM_PROTO_EXTERN_H__
-#        define __RLC_TM_PROTO_EXTERN_H__
-//-----------------------------------------------------------------------------
-#        include "platform_types.h"
-#        include "platform_constants.h"
-//-----------------------------------------------------------------------------
-#        include "list.h"
-#        include "rlc_tm_entity.h"
-#        include "mac_primitives.h"
-#        include "mem_block.h"
-//-----------------------------------------------------------------------------
-extern void     display_protocol_vars_rlc_tm (struct rlc_tm_entity *rlcP);
-extern uint32_t      rlc_tm_get_buffer_occupancy (struct rlc_tm_entity *rlcP, uint8_t logical_channelsP);
-extern void     init_rlc_tm (struct rlc_tm_entity *rlcP);
-extern void    *rlc_tm_tx (void *argP);
-extern void     rlc_tm_rx_no_segment (void *argP, struct mac_data_ind data_indP);
-extern void     rlc_tm_rx_segment (void *argP, struct mac_data_ind data_indP);
-extern void     send_rlc_tm_control_primitive (struct rlc_tm_entity *rlcP, module_id_t module_idP, mem_block_t *cprimitiveP);
-
-extern struct mac_status_resp rlc_tm_mac_status_indication (void *rlcP, uint16_t tb_sizeP, struct mac_status_ind tx_statusP);
-extern struct mac_data_req rlc_tm_mac_data_request (void *rlcP);
-extern void     rlc_tm_mac_data_indication (void *rlcP, struct mac_data_ind data_indP);
-extern void     rlc_tm_data_req (void *rlcP, mem_block_t *sduP);
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_reassembly.c b/openair2/LAYER2/RLC/TM/rlc_tm_reassembly.c
deleted file mode 100755
index 616df0ba395c843cd402040c4748f99c76222ee0..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_reassembly.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/***************************************************************************
-                          rlc_tm_reassembly.c  -
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
-
- ***************************************************************************/
-#define RLC_TM_C
-//#include "rtos_header.h"
-#include "platform_types.h"
-//-----------------------------------------------------------------------------
-#include "rlc.h"
-#include "rlc_tm_structs.h"
-#include "rlc_primitives.h"
-#include "rlc_tm_constants.h"
-#include "list.h"
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-void
-rlc_tm_send_sdu_no_segment (struct rlc_tm_entity *rlcP, uint8_t error_indicationP, uint8_t * srcP, uint16_t length_in_bitsP)
-{
-  //-----------------------------------------------------------------------------
-  int             length_in_bytes;
-#ifdef DEBUG_RLC_TM_DISPLAY_ASCII_DATA
-  int             index;
-#endif
-#ifdef DEBUG_RLC_TM_REASSEMBLY
-  msg ("[RLC_TM %p][SEND_SDU] %d bits\n", rlcP, length_in_bitsP);
-#endif
-  length_in_bytes = (length_in_bitsP + 7) >> 3;
-
-  if (rlcP->output_sdu_in_construction == NULL) {
-    rlcP->output_sdu_in_construction = get_free_mem_block (length_in_bytes);
-  }
-
-  if ((rlcP->output_sdu_in_construction)) {
-#ifdef DEBUG_RLC_TM_DISPLAY_ASCII_DATA
-    msg ("[RLC_TM %p][SEND_SDU] DATA :", rlcP);
-
-    for (index = 0; index < length_in_bytes; index++) {
-      msg ("%c", srcP[index]);
-    }
-
-    msg ("\n");
-#endif
-
-    memcpy (&rlcP->output_sdu_in_construction->data[rlcP->output_sdu_size_to_write], srcP, length_in_bytes);
-
-#warning loss of error indication parameter
-    rlc_data_ind (rlcP->module_id, rlcP->rb_id, length_in_bytes, rlcP->output_sdu_in_construction, rlcP->data_plane);
-    rlcP->output_sdu_in_construction = NULL;
-  } else {
-    msg ("[RLC_TM %p][SEND_SDU] ERROR  OUTPUT SDU IS NULL\n", rlcP);
-  }
-}
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_send_sdu_segment (struct rlc_tm_entity *rlcP, uint8_t error_indicationP)
-{
-  //-----------------------------------------------------------------------------
-  if ((rlcP->output_sdu_in_construction) && (rlcP->output_sdu_size_to_write)) {
-#ifdef DEBUG_RLC_TM_SEND_SDU
-    msg ("[RLC_TM %p] SEND_SDU   %d bytes\n", rlcP, rlcP->output_sdu_size_to_write);
-#endif
-#warning loss of error indication parameter
-    rlc_data_ind (rlcP->module_id, rlcP->rb_id, rlcP->output_sdu_size_to_write, rlcP->output_sdu_in_construction, rlcP->data_plane);
-    rlcP->output_sdu_in_construction = NULL;
-    rlcP->output_sdu_size_to_write = 0;
-  }
-}
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_reassembly_proto_extern.h b/openair2/LAYER2/RLC/TM/rlc_tm_reassembly_proto_extern.h
deleted file mode 100755
index 8ef97c58fcb161cbcd90e49e8c1b8763df6e4ae8..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_reassembly_proto_extern.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_reassembly_proto_extern.h
-* \brief This file defines the prototypes of the functions dealing with the reassembly and the sent of SDUs to upper layer.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_REASSEMBLY_H__
-#        define __RLC_TM_REASSEMBLY_H__
-//-----------------------------------------------------------------------------
-#        include "rlc_tm_entity.h"
-//-----------------------------------------------------------------------------
-extern void     rlc_tm_send_sdu_no_segment (struct rlc_tm_entity *rlcP, uint8_t error_indicationP, uint8_t * srcP, uint16_t length_in_bitsP);
-extern void     rlc_tm_send_sdu_segment (struct rlc_tm_entity *rlcP, uint8_t error_indicationP);
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_segment.c b/openair2/LAYER2/RLC/TM/rlc_tm_segment.c
deleted file mode 100755
index 5035377e886517109ebfc8be0d81ea912c6977e5..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_segment.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/***************************************************************************
-                          rlc_tm_segment.c  -
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
- ***************************************************************************/
-//#include "rtos_header.h"
-#include "platform_types.h"
-//-----------------------------------------------------------------------------
-#include "list.h"
-#include "rlc_tm_entity.h"
-#include "rlc_tm_structs.h"
-#include "rlc_primitives.h"
-#include "mem_block.h"
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_no_segment (struct rlc_tm_entity* rlcP)
-{
-  //-----------------------------------------------------------------------------
-  mem_block_t* pdu;
-  struct rlc_tm_tx_sdu_management* sdu_mngt;
-  struct rlc_tm_tx_pdu_management* pdu_mngt;
-  int             discard_go_on;
-  int             nb_pdu_to_transmit;
-  nb_pdu_to_transmit = rlcP->nb_pdu_requested_by_mac;
-  pdu = NULL;
-
-  if ((rlcP->sdu_discard_mode & RLC_SDU_DISCARD_TIMER_BASED_NO_EXPLICIT)) {
-    discard_go_on = 1;
-
-    while ((rlcP->input_sdus[rlcP->current_sdu_index]) && discard_go_on) {
-      if ((*rlcP->frame_tick_milliseconds - ((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data))->sdu_creation_time) >=
-          rlcP->timer_discard_init) {
-#ifdef DEBUG_RLC_TM_DISCARD_SDU
-        msg("[RLC_TM %p] SDU DISCARDED  TIMED OUT %ld ms ", rlcP,
-            (*rlcP->frame_tick_milliseconds - ((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data))->sdu_creation_time));
-        msg("BO %d, NB SDU %d\n", rlcP->buffer_occupancy, rlcP->nb_sdu);
-#endif
-        rlcP->buffer_occupancy -= (((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data))->sdu_size >> 3);
-        rlcP->nb_sdu -= 1;
-        free_mem_block (rlcP->input_sdus[rlcP->current_sdu_index]);
-        rlcP->input_sdus[rlcP->current_sdu_index] = NULL;
-        rlcP->current_sdu_index = (rlcP->current_sdu_index + 1) % rlcP->size_input_sdus_buffer;
-
-      } else {
-        discard_go_on = 0;
-      }
-    }
-  }
-
-  // only one SDU per TTI
-  while ((rlcP->input_sdus[rlcP->current_sdu_index]) && (nb_pdu_to_transmit > 0)) {
-    sdu_mngt = ((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data));
-
-    //PRINT_RLC_TM_SEGMENT("[RLC_TM %p] SEGMENT GET NEW SDU %p AVAILABLE SIZE %d Bytes\n", rlcP, sdu_mngt, sdu_mngt->sdu_remaining_size);
-    if (!(pdu = get_free_mem_block (((rlcP->rlc_pdu_size + 7) >> 3) + sizeof (struct rlc_tm_tx_data_pdu_struct) + GUARD_CRC_LIH_SIZE))) {
-      msg ("[RLC_TM %p][SEGMENT] ERROR COULD NOT GET NEW PDU, EXIT\n", rlcP);
-      return;
-    }
-
-    // SHOULD BE OPTIMIZED...SOON
-    pdu_mngt = (struct rlc_tm_tx_pdu_management*) (pdu->data);
-    memset (pdu->data, 0, sizeof (struct rlc_tm_tx_pdu_management));
-    pdu_mngt->first_byte = (uint8_t*)&pdu->data[sizeof (struct rlc_tm_tx_data_pdu_struct)];
-    memcpy (pdu_mngt->first_byte, sdu_mngt->first_byte, ((rlcP->rlc_pdu_size + 7) >> 3));
-    ((struct mac_tb_req*) (pdu->data))->rlc = NULL;
-    ((struct mac_tb_req*) (pdu->data))->data_ptr = pdu_mngt->first_byte;
-    ((struct mac_tb_req*) (pdu->data))->first_bit = 0;
-    ((struct mac_tb_req*) (pdu->data))->tb_size_in_bits = rlcP->rlc_pdu_size;
-    list_add_tail_eurecom (pdu, &rlcP->pdus_to_mac_layer);
-    rlcP->buffer_occupancy -= (sdu_mngt->sdu_size >> 3);
-    free_mem_block (rlcP->input_sdus[rlcP->current_sdu_index]);
-    rlcP->input_sdus[rlcP->current_sdu_index] = NULL;
-    rlcP->current_sdu_index = (rlcP->current_sdu_index + 1) % rlcP->size_input_sdus_buffer;
-    rlcP->nb_sdu -= 1;
-  }
-}
-
-
-//-----------------------------------------------------------------------------
-void
-rlc_tm_segment (struct rlc_tm_entity* rlcP)
-{
-  //-----------------------------------------------------------------------------
-  mem_block_t* pdu;
-  struct rlc_tm_tx_sdu_management* sdu_mngt;
-  struct rlc_tm_tx_pdu_management* pdu_mngt;
-  int             discard_go_on;
-  int             nb_pdu_to_transmit;
-  nb_pdu_to_transmit = rlcP->nb_pdu_requested_by_mac;
-  pdu = NULL;
-
-  if ((rlcP->sdu_discard_mode & RLC_SDU_DISCARD_TIMER_BASED_NO_EXPLICIT)) {
-    discard_go_on = 1;
-
-    while ((rlcP->input_sdus[rlcP->current_sdu_index]) && discard_go_on) {
-      if ((*rlcP->frame_tick_milliseconds - ((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data))->sdu_creation_time) >=
-          rlcP->timer_discard_init) {
-#ifdef DEBUG_RLC_TM_DISCARD_SDU
-        msg("[RLC_TM %p] SDU DISCARDED  TIMED OUT %ld ms ", rlcP,
-            (*rlcP->frame_tick_milliseconds - ((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data))->sdu_creation_time));
-        msg ("BO %d, NB SDU %d\n", rlcP->buffer_occupancy, rlcP->nb_sdu);
-#endif
-        rlcP->nb_sdu -= 1;
-        free_mem_block (rlcP->input_sdus[rlcP->current_sdu_index]);
-        rlcP->input_sdus[rlcP->current_sdu_index] = NULL;
-        rlcP->current_sdu_index = (rlcP->current_sdu_index + 1) % rlcP->size_input_sdus_buffer;
-
-      } else {
-        discard_go_on = 0;
-      }
-    }
-  }
-
-  // only one SDU per TTI
-  if ((rlcP->input_sdus[rlcP->current_sdu_index])) {
-    sdu_mngt = (struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data);
-
-    //PRINT_RLC_TM_SEGMENT("[RLC_TM %p] SEGMENT GET NEW SDU %p AVAILABLE SIZE %d Bytes\n", rlcP, sdu_mngt, sdu_mngt->sdu_remaining_size);
-    while ((nb_pdu_to_transmit > 0) && (sdu_mngt->sdu_segmented_size < sdu_mngt->sdu_size)) {
-      if (!(pdu = get_free_mem_block (((rlcP->rlc_pdu_size + 7) >> 3) + 1 + sizeof (struct rlc_tm_tx_data_pdu_struct) + GUARD_CRC_LIH_SIZE))) {
-        msg ("[RLC_TM %p][SEGMENT] ERROR COULD NOT GET NEW PDU, EXIT\n", rlcP);
-        return;
-      }
-
-      // SHOULD BE OPTIMIZED...SOON
-      pdu_mngt = (struct rlc_tm_tx_pdu_management*) (pdu->data);
-      memset (pdu->data, 0, sizeof (struct rlc_tm_tx_pdu_management));
-      pdu_mngt->first_byte = (uint8_t*)&pdu->data[sizeof (struct rlc_tm_tx_data_pdu_struct)];
-      memcpy (pdu_mngt->first_byte, &sdu_mngt->first_byte[sdu_mngt->sdu_segmented_size >> 3], ((rlcP->rlc_pdu_size + 7) >> 3));
-      ((struct mac_tb_req*) (pdu->data))->rlc = NULL;
-      ((struct mac_tb_req*) (pdu->data))->data_ptr = pdu_mngt->first_byte;
-      ((struct mac_tb_req*) (pdu->data))->first_bit = sdu_mngt->sdu_segmented_size & 0x07;
-      ((struct mac_tb_req*) (pdu->data))->tb_size_in_bits = rlcP->rlc_pdu_size;
-      list_add_tail_eurecom (pdu, &rlcP->pdus_to_mac_layer);
-      sdu_mngt->sdu_segmented_size += rlcP->rlc_pdu_size;
-      nb_pdu_to_transmit -= 1;
-    }
-
-    free_mem_block (rlcP->input_sdus[rlcP->current_sdu_index]);
-    rlcP->input_sdus[rlcP->current_sdu_index] = NULL;
-    rlcP->current_sdu_index = (rlcP->current_sdu_index + 1) % rlcP->size_input_sdus_buffer;
-    rlcP->nb_sdu -= 1;
-  }
-
-  if ((rlcP->input_sdus[rlcP->current_sdu_index])) {
-    rlcP->buffer_occupancy = ((struct rlc_tm_tx_sdu_management*) (rlcP->input_sdus[rlcP->current_sdu_index]->data))->sdu_size >> 3;
-
-  } else {
-    rlcP->buffer_occupancy = 0;
-  }
-}
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_segment_proto_extern.h b/openair2/LAYER2/RLC/TM/rlc_tm_segment_proto_extern.h
deleted file mode 100755
index f2625e2bef702deb90c6ded860f673edc7a14edb..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_segment_proto_extern.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_segment_proto_extern.h
-* \brief This file defines the prototypes of the functions dealing with the segmentation of SDUs coming from upper layers.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_SEGMENT_H__
-#        define __RLC_TM_SEGMENT_H__
-//-----------------------------------------------------------------------------
-#        include "rlc_tm_entity.h"
-//-----------------------------------------------------------------------------
-extern void     rlc_tm_segment (struct rlc_tm_entity *rlcP);
-extern void     rlc_tm_no_segment (struct rlc_tm_entity *rlcP);
-#    endif
diff --git a/openair2/LAYER2/RLC/TM/rlc_tm_structs.h b/openair2/LAYER2/RLC/TM/rlc_tm_structs.h
deleted file mode 100755
index 47205984ca5104965f86c049cf8b28ed110f542e..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/RLC/TM/rlc_tm_structs.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
-    OpenAirInterface
-    Copyright(c) 1999 - 2014 Eurecom
-
-    OpenAirInterface is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    OpenAirInterface is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenAirInterface.The full GNU General Public License is
-   included in this distribution in the file called "COPYING". If not,
-   see <http://www.gnu.org/licenses/>.
-
-  Contact Information
-  OpenAirInterface Admin: openair_admin@eurecom.fr
-  OpenAirInterface Tech : openair_tech@eurecom.fr
-  OpenAirInterface Dev  : openair4g-devel@eurecom.fr
-
-  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
- *******************************************************************************/
-
-/*! \file rlc_tm_structs.h
-* \brief This file defines structures used inside the RLC TM.
-* \author GAUTHIER Lionel
-* \date 2010-2011
-* \version
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-* \note
-* \bug
-* \warning
-*/
-#    ifndef __RLC_TM_STRUCTS_H__
-#        define __RLC_TM_STRUCTS_H__
-//-----------------------
-#        include "platform_types.h"
-#        include "platform_constants.h"
-#        include "list.h"
-#        include "mem_block.h"
-#        include "rlc_tm_constants.h"
-#        include "rlc_primitives.h"
-#        include "mac_primitives.h"
-#        include "mac_rlc_primitives.h"
-//-----------------------
-struct rlc_tm_tx_sdu_management {
-  uint8_t             *first_byte;
-  int32_t             sdu_creation_time;
-  uint16_t             sdu_segmented_size;
-  uint16_t             sdu_size;
-};
-//-----------------------
-struct rlc_tm_tx_pdu_management {
-  uint8_t             *first_byte;
-  uint8_t              dummy[MAC_HEADER_MAX_SIZE];
-};
-//-----------------------
-struct rlc_tm_rx_pdu_management {
-  uint8_t             *first_byte;
-};
-//-----------------------
-struct rlc_tm_tx_data_pdu_struct {
-  union {
-    struct rlc_tm_tx_pdu_management tx_pdu_mngmnt;
-    struct mac_tb_req tb_req;
-    struct mac_tx_tb_management tb_mngt;
-#        ifdef BYPASS_L1
-    struct rlc_tm_rx_pdu_management dummy1;
-    struct mac_tb_ind dummy2;
-    struct mac_rx_tb_management dummy3;
-    struct rlc_indication dummy4;
-#        endif
-  } dummy;
-  uint8_t              data[1];
-};
-//-----------------------
-struct rlc_tm_data_req_alloc {  // alloc enought bytes for sdu mngt also
-  union {
-    struct rlc_tm_data_req dummy1;
-    struct rlc_tm_tx_sdu_management dummy2;
-  } dummy;
-};
-#    endif