diff --git a/openair2/LAYER2/PDCP/COPYING b/openair2/LAYER2/PDCP/COPYING
deleted file mode 100644
index 94a9ed024d3859793618152ea559a168bbcbb5e2..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/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/PDCP/pdcp.c b/openair2/LAYER2/PDCP/pdcp.c
deleted file mode 100755
index 349ff42c225b50a8d38ea1949fdb1f25fc8b62ad..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
-
-  Eurecom OpenAirInterface
-  Copyright(c) 1999 - 2011 Eurecom
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information
-  Openair Admin: openair_admin@eurecom.fr
-  Openair Tech : openair_tech@eurecom.fr
-  Forums       : http://forums.eurecom.fsr/openairinterface
-  Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
-
-*******************************************************************************/
-
-/*! \file pdcp.c
-* \brief pdcp interface with RLC
-* \author  Lionel GAUTHIER and Navid Nikaein
-* \date 2009
-* \version 0.5
-
-*/
-
-#define PDCP_C
-//#include "rtos_header.h"
-#ifndef USER_MODE
-#include <rtai_fifos.h>
-#endif
-#include "pdcp.h"
-#include "LAYER2/RLC/rlc.h"
-#include "LAYER2/MAC/extern.h"
-
-//#include "mpls.h"
-//#include "w3g4free_extern.h"
-
-#define PDCP_DATA_REQ_DEBUG 1
-#define PDCP_DATA_IND_DEBUG 1
-
-//#define IDROMEL_NEMO 1
-
-extern rlc_op_status_t rlc_data_req     (module_id_t, rb_id_t, mui_t, confirm_t, sdu_size_t, mem_block_t*);
-
-//-----------------------------------------------------------------------------
-void
-pdcp_data_req (module_id_t module_idP, rb_id_t rab_idP, sdu_size_t data_sizeP, char* sduP)
-{
-  //-----------------------------------------------------------------------------
-  mem_block_t*      new_sdu = NULL;
-
-  //    int i;
-
-  if ((data_sizeP > 0)) {
-    if(data_sizeP > MAX_IP_PACKET_SIZE) {
-      msg("[PDCP] REQ FOR  SIZE %d !!!Abort\n",data_sizeP);
-      mac_xface->macphy_exit("");
-    }
-
-    new_sdu = get_free_mem_block (data_sizeP);
-
-    if (new_sdu) {
-
-
-#ifdef PDCP_DATA_REQ_DEBUG
-      msg("[PDCP] TTI %d, INST %d: PDCP_DATA_REQ size %d RAB %d:\n",Mac_rlc_xface->frame,module_idP,data_sizeP,rab_idP);
-
-      //    for (i=0;i<20;i++)
-      //      msg("%02X.",((unsigned char*)sduP)[i]);
-      //    msg("\n");
-#endif //PDCP_DATA_REQ_DEBUG
-      // PROCESS OF DECOMPRESSION HERE:
-      memcpy (&new_sdu->data[0], sduP, data_sizeP);
-
-      rlc_data_req(module_idP, rab_idP, RLC_MUI_UNDEFINED, RLC_SDU_CONFIRM_NO, data_sizeP, new_sdu);
-
-      if(Mac_rlc_xface->Is_cluster_head[module_idP]==1) {
-        Pdcp_stats_tx[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]++;
-        Pdcp_stats_tx_bytes[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]+=data_sizeP;
-
-      } else {
-        Pdcp_stats_tx[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]++;
-        Pdcp_stats_tx_bytes[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]+=data_sizeP;
-      }
-
-    } else {
-      msg("[PDCP][RAB %d][ERROR] PDCP_DATA_REQ OUT OF MEMORY\n", rab_idP);
-    }
-
-    //  free_mem_block (sduP);
-
-  } else {
-    msg("[PDCP][RAB %d][ERROR] PDCP_DATA_REQ SDU SIZE %d\n", rab_idP, data_sizeP);
-  }
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_data_ind (module_id_t module_idP, rb_id_t rab_idP, sdu_size_t data_sizeP, mem_block_t* sduP)
-{
-  //-----------------------------------------------------------------------------
-  mem_block_t*      new_sdu = NULL;
-  int i;
-
-  if ((data_sizeP > 0)) {
-    //   if(Mac_rlc_xface->Is_cluster_head[0]==1 && Mac_rlc_xface->frame%10==0)
-    //msg("[PDCP][RAB %d][INST %d] PDCP_DATA_IND size %d\n", rab_idP,module_idP,data_sizeP);
-#ifdef PDCP_DATA_IND_DEBUG
-    msg("[PDCP][RAB %d][INST %d] TTI %d PDCP_DATA_IND size %d\n",
-        rab_idP,module_idP,Mac_rlc_xface->frame,data_sizeP);
-
-    for (i=0; i<20; i++) {
-      msg("%02X.",(unsigned char)sduP->data[i]);
-    }
-
-    msg("\n");
-#endif //PDCP_DATA_IND_DEBUG
-    new_sdu = get_free_mem_block (data_sizeP + sizeof (pdcp_data_ind_header_t));
-
-    if (new_sdu) {
-      memset (new_sdu->data, 0, sizeof (pdcp_data_ind_header_t));
-      ((pdcp_data_ind_header_t*) new_sdu->data)->rb_id     = rab_idP;
-      ((pdcp_data_ind_header_t*) new_sdu->data)->data_size = data_sizeP;
-      // Here there is no virtualization possible
-#ifdef IDROMEL_NEMO
-
-      if (Mac_rlc_xface->Is_cluster_head[module_idP] == 0) {
-        ((pdcp_data_ind_header_t*) new_sdu->data)->inst = rab_idP/8;
-      }
-
-      else {
-        ((pdcp_data_ind_header_t*) new_sdu->data)->inst = 0;
-      }
-
-#else
-      ((pdcp_data_ind_header_t*) new_sdu->data)->inst = module_idP;
-#endif
-      // PROCESS OF DECOMPRESSION HERE:
-      memcpy (&new_sdu->data[sizeof (pdcp_data_ind_header_t)], &sduP->data[0], data_sizeP);
-      list_add_tail_eurecom (new_sdu, &pdcp_sdu_list);
-
-      if(Mac_rlc_xface->Is_cluster_head[module_idP]==1) {
-        Pdcp_stats_rx[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]++;
-        Pdcp_stats_rx_bytes[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]+=data_sizeP;
-      } else {
-        Pdcp_stats_rx[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]++;
-        Pdcp_stats_rx_bytes[module_idP][(rab_idP & RAB_OFFSET2 )>> RAB_SHIFT2][(rab_idP & RAB_OFFSET)-DTCH]+=data_sizeP;
-      }
-    }
-
-    free_mem_block (sduP);
-  }
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_run (void)
-{
-  //-----------------------------------------------------------------------------
-  // NAS -> PDCP traffic
-#ifndef PDCP_USE_NETLINK
-#ifdef USER_MODE
-  //#define PDCP_DUMMY_BUFFER_SIZE 38
-  //  unsigned char pdcp_dummy_buffer[PDCP_DUMMY_BUFFER_SIZE];
-  //msg("[PDCP] PDCP Run Id %d\n",modId);
-  /*
-  if(Mac_rlc_xface->frame %1 == 0 && (Mac_rlc_xface->frame > 30))  {
-    if (Mac_rlc_xface->Is_cluster_head[0] ==0){
-      pdcp_data_req(0,5,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-      pdcp_data_req(0,4,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-
-    //     pdcp_data_req(0,4,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-    // pdcp_data_req(3,4,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-    //pdcp_data_req(4,4,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-    }
-    // if (Mac_rlc_xface->Is_cluster_head[modId] == 1 && Mac_rlc_xface->frame %20 == 0)  {
-    else{
-      pdcp_data_req(0,20,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-      pdcp_data_req(0,21,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-      pdcp_data_req(0,12,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-      pdcp_data_req(0,13,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-
-    //pdcp_data_req(0,20,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-    }
-    // pdcp_data_req(0,28,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-    //       pdcp_data_req(0,36,PDCP_DUMMY_BUFFER_SIZE,pdcp_dummy_buffer);
-
-    }*/
-#endif
-#endif
-  unsigned int diff,i,k,j;
-
-  if((Mac_rlc_xface->frame%128)==0) {
-    //    for(i=0;i<NB_INST;i++)
-    for(i=0; i<NB_UE_INST; i++)
-      for (j=0; j<NB_CNX_CH; j++)
-        for(k=0; k<NB_RAB_MAX; k++) {
-          diff = Pdcp_stats_tx_bytes[i][j][k];
-          Pdcp_stats_tx_bytes[i][j][k]=0;
-          Pdcp_stats_tx_rate[i][j][k] = (diff*8)>>7;// (Pdcp_stats_tx_rate[i][k]*1+(7*diff*8)>>7)/8;
-          diff = Pdcp_stats_rx_bytes[i][j][k];
-          Pdcp_stats_rx_bytes[i][j][k]=0;
-          Pdcp_stats_rx_rate[i][j][k] =(diff*8)>>7;//(Pdcp_stats_rx_rate[i][k]*1 + (7*diff*8)>>7)/8;
-        }
-  }
-
-  // printf("[PDCP]Read sdus from NAS\n");
-  pdcp_fifo_read_input_sdus();
-  // PDCP -> NAS traffic
-  pdcp_fifo_flush_sdus();
-  /*printf("PDCP TTI %d\n", Mac_rlc_xface->frame);
-  for (i = 0; i < 3; i++) {
-      printf("[RLC_RRC][MOD ID %d] AM:",  i);
-      for (j = 0; j < RLC_MAX_NUM_INSTANCES_RLC_AM; j++) {
-          printf("%d", rlc[i].m_rlc_am_array[j].allocation);
-      }
-      printf("\n[RLC_RRC][MOD ID %d] UM:", i);
-      for (j = 0; j < RLC_MAX_NUM_INSTANCES_RLC_UM; j++) {
-          printf("%d", rlc[i].m_rlc_um_array[j].allocation);
-      }
-      printf("\n");
-  }*/
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_config_req (module_id_t module_idP, rb_id_t rab_idP)
-{
-  //-----------------------------------------------------------------------------
-  //msg ("[PDCP] pdcp_confiq_req()\n");
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_config_release (module_id_t module_idP, rb_id_t rab_idP)
-{
-  //-----------------------------------------------------------------------------
-  //msg ("[PDCP] pdcp_config_release()\n");
-}
-//-----------------------------------------------------------------------------
-int
-pdcp_module_init ()
-{
-  //-----------------------------------------------------------------------------
-#ifndef USER_MODE
-  int ret;
-  ret=rtf_create(PDCP2NW_DRIVER_FIFO,32768);
-
-  if (ret < 0) {
-    printk("[openair][MAC][INIT] Cannot create PDCP2NAS fifo %d (ERROR %d)\n",PDCP2NW_DRIVER_FIFO,ret);
-    return(-1);
-
-  } else {
-    printk("[openair][MAC][INIT] Created PDCP2NAS fifo %d\n",PDCP2NW_DRIVER_FIFO);
-    rtf_reset(PDCP2NW_DRIVER_FIFO);
-  }
-
-  ret=rtf_create(NW_DRIVER2PDCP_FIFO,32768);
-
-  if (ret < 0) {
-    printk("[openair][MAC][INIT] Cannot create NAS2PDCP fifo %d (ERROR %d)\n",NW_DRIVER2PDCP_FIFO,ret);
-    return(-1);
-
-  } else {
-    printk("[openair][MAC][INIT] Created NAS2PDCP fifo %d\n",NW_DRIVER2PDCP_FIFO);
-    rtf_reset(NW_DRIVER2PDCP_FIFO);
-  }
-
-  pdcp_2_nas_irq = 0;
-  pdcp_input_sdu_remaining_size_to_read=0;
-  pdcp_input_sdu_size_read=0;
-#endif
-  return(0);
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_module_cleanup ()
-//-----------------------------------------------------------------------------
-{
-#ifndef USER_MODE
-  rtf_destroy(NW_DRIVER2PDCP_FIFO);
-  rtf_destroy(PDCP2NW_DRIVER_FIFO);
-#endif
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_layer_init ()
-{
-  //-----------------------------------------------------------------------------
-  unsigned int i,j,k;
-  list_init (&pdcp_sdu_list, NULL);
-  msg("[PDCP] pdcp_layer_init \n ");
-  pdcp_output_sdu_bytes_to_write=0;
-  pdcp_output_header_bytes_to_write=0;
-  pdcp_input_sdu_remaining_size_to_read=0;
-
-  //    for (i=0;i<NB_INST;i++)
-  for (i=0; i<NB_UE_INST; i++)
-    for (k=0; k<NB_CNX_CH; k++)
-      for(j=0; j<NB_RAB_MAX; j++) {
-        Pdcp_stats_tx[i][k][j]=0;
-        Pdcp_stats_tx_bytes[i][k][j]=0;
-        Pdcp_stats_tx_bytes_last[i][k][j]=0;
-        Pdcp_stats_tx_rate[i][k][j]=0;
-        Pdcp_stats_rx[i][k][j]=0;
-        Pdcp_stats_rx_bytes[i][k][j]=0;
-        Pdcp_stats_rx_bytes_last[i][k][j]=0;
-        Pdcp_stats_rx_rate[i][k][j]=0;
-      }
-}
-//-----------------------------------------------------------------------------
-void
-pdcp_layer_cleanup ()
-//-----------------------------------------------------------------------------
-{
-  list_free (&pdcp_sdu_list);
-}
-
-#ifndef USER_MODE
-EXPORT_SYMBOL(pdcp_2_nas_irq);
-#endif //USER_MODE
diff --git a/openair2/LAYER2/PDCP/pdcp.h b/openair2/LAYER2/PDCP/pdcp.h
deleted file mode 100755
index b71616fe6882514d4fba03b222fec84d8da26f88..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-                                 pdcp.h
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
- ***************************************************************************/
-#ifndef __PDCP_H__
-#    define __PDCP_H__
-//-----------------------------------------------------------------------------
-#    ifdef PDCP_C
-#        define private_pdcp(x) x
-#        define protected_pdcp(x) x
-#        define public_pdcp(x) x
-#    else
-#        define private_pdcp(x)
-#        define public_pdcp(x) extern x
-#        ifdef PDCP_FIFO_C
-#            define protected_pdcp(x) extern x
-#        else
-#            define protected_pdcp(x)
-#        endif
-#    endif
-
-#    ifdef PDCP_FIFO_C
-#        define private_pdcp_fifo(x) x
-#        define protected_pdcp_fifo(x) x
-#        define public_pdcp_fifo(x) x
-#    else
-#        define private_pdcp_fifo(x)
-#        define public_pdcp_fifo(x) extern x
-#        ifdef PDCP_C
-#            define protected_pdcp_fifo(x) extern x
-#        else
-#            define protected_pdcp_fifo(x)
-#        endif
-#    endif
-//-----------------------------------------------------------------------------
-#ifndef NON_ACCESS_STRATUM
-//#include "rtos_header.h"
-//#include "openair_defs.h"
-//#include "platform_types.h"
-//#include "platform_constants.h"
-#include "UTIL/MEM/mem_block.h"
-#include "UTIL/LISTS/list.h"
-#include "COMMON/mac_rrc_primitives.h"
-#endif //NON_ACCESS_STRATUM
-//-----------------------------------------------------------------------------
-
-public_pdcp(unsigned int Pdcp_stats_tx[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_tx_bytes[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_tx_bytes_last[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_tx_rate[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_rx[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_rx_bytes[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_rx_bytes_last[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-public_pdcp(unsigned int Pdcp_stats_rx_rate[NB_MODULES_MAX][NB_CNX_CH][NB_RAB_MAX]);
-
-public_pdcp(void pdcp_data_req       (module_id_t, rb_id_t, sdu_size_t, char*);)
-public_pdcp(void pdcp_data_ind       (module_id_t, rb_id_t, sdu_size_t, mem_block_t*);)
-public_pdcp(void pdcp_config_req     (module_id_t, rb_id_t);)
-public_pdcp(void pdcp_config_release (module_id_t, rb_id_t);)
-
-
-public_pdcp(void pdcp_run (void);)
-public_pdcp(int pdcp_module_init ();)
-public_pdcp(void pdcp_module_cleanup ();)
-public_pdcp(void pdcp_layer_init ();)
-public_pdcp(void pdcp_layer_cleanup ();)
-
-#define PDCP2NW_DRIVER_FIFO 21
-#define NW_DRIVER2PDCP_FIFO 22
-
-protected_pdcp_fifo(int pdcp_fifo_flush_sdus ();)
-protected_pdcp_fifo(int pdcp_fifo_read_input_sdus_remaining_bytes ();)
-protected_pdcp_fifo(int pdcp_fifo_read_input_sdus();)
-//-----------------------------------------------------------------------------
-
-typedef struct pdcp_data_req_header_t {
-  rb_id_t             rb_id;
-  sdu_size_t           data_size;
-  int       inst;
-} pdcp_data_req_header_t;
-
-typedef struct pdcp_data_ind_header_t {
-  rb_id_t             rb_id;
-  sdu_size_t           data_size;
-  int       inst;
-} pdcp_data_ind_header_t;
-
-typedef struct pdcp_t {
-  char              allocation;
-  // here ROHC variables for header compression/decompression
-} pdcp_t;
-protected_pdcp(signed int             pdcp_2_nas_irq;)
-protected_pdcp(pdcp_t                 pdcp_array[MAX_MODULES][MAX_RAB];)
-protected_pdcp(sdu_size_t             pdcp_output_sdu_bytes_to_write;)
-protected_pdcp(sdu_size_t             pdcp_output_header_bytes_to_write;)
-protected_pdcp(list_t                 pdcp_sdu_list;)
-protected_pdcp(int                    pdcp_sent_a_sdu;)
-protected_pdcp(pdcp_data_req_header_t pdcp_input_header;)
-protected_pdcp(char                   pdcp_input_sdu_buffer[MAX_IP_PACKET_SIZE];)
-protected_pdcp(sdu_size_t             pdcp_input_index_header;)
-protected_pdcp(sdu_size_t             pdcp_input_sdu_size_read;)
-protected_pdcp(sdu_size_t             pdcp_input_sdu_remaining_size_to_read;)
-#endif
diff --git a/openair2/LAYER2/PDCP/pdcp_control_primitive.c b/openair2/LAYER2/PDCP/pdcp_control_primitive.c
deleted file mode 100755
index f6c76b0e29ef79e933316a0c47e94285f5cd27f1..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp_control_primitive.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
-                        pdcp_control_primitives.c
-                             -------------------
-    begin                : Mon Dec 10 2001
-    copyright            : (C) 2001 by EURECOM
-    email                : Lionel.Gauthier@eurecom.fr
-                             -------------------
-    description
-    This file contains the functions used for configuration of pdcp
-
- ***************************************************************************/
-#include "rtos_header.h"
-#include "platform.h"
-#include "protocol_vars_extern.h"
-#include "print.h"
-//-----------------------------------------------------------------------------
-#include "rlc.h"
-#include "pdcp.h"
-#include "debug_l2.h"
-//-----------------------------------------------------------------------------
-void
-configure_pdcp_req (struct pdcp_entity *pdcpP, void *rlcP, uint8_t rlc_sap_typeP, uint8_t header_compression_typeP)
-{
-  //-----------------------------------------------------------------------------
-  mem_block      *mb;
-
-  mb = get_free_mem_block (sizeof (struct cpdcp_primitive));
-  ((struct cpdcp_primitive *) mb->data)->type = CPDCP_CONFIG_REQ;
-  ((struct cpdcp_primitive *) mb->data)->primitive.config_req.rlc_sap = rlcP;
-  ((struct cpdcp_primitive *) mb->data)->primitive.config_req.rlc_type_sap = rlc_sap_typeP;
-  ((struct cpdcp_primitive *) mb->data)->primitive.config_req.header_compression_type = header_compression_typeP;
-  send_pdcp_control_primitive (pdcpP, mb);
-}
diff --git a/openair2/LAYER2/PDCP/pdcp_control_primitives_proto_extern.h b/openair2/LAYER2/PDCP/pdcp_control_primitives_proto_extern.h
deleted file mode 100755
index c7aaf016b50436d228cb901d8795386814bc1b2f..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp_control_primitives_proto_extern.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/***************************************************************************
-                            pdcp_control_primitives_proto_extern.h
-                             -------------------
-    begin                : Mon Dec 10 2001
-    copyright            : (C) 2001 by EURECOM
-    email                : Lionel.Gauthier@eurecom.fr
-                             -------------------
-    description
-    This file contains the prototypes of functions used for configuration of pdcp
-
- ***************************************************************************/
-#ifndef PDCP_CONTROL_PRIMITIVES_PROTO_EXTERN_H
-#    define PDCP_CONTROL_PRIMITIVES_PROTO_EXTERN_H
-#    include "pdcp.h"
-void            rrc_configure_pdcp (struct pdcp_entity *pdcpP, void *rlcP, uint8_t rlc_sap_typeP, uint8_t header_compression_typeP);
-#endif
diff --git a/openair2/LAYER2/PDCP/pdcp_entity.h b/openair2/LAYER2/PDCP/pdcp_entity.h
deleted file mode 100755
index ccfd86926233af9f21395bf9d56fc655550cbedf..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp_entity.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-                               pdcp_entity.h
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
- ***************************************************************************/
-#ifndef __PDCP_ENTITY_H__
-#    define __PDCP_ENTITY_H__
-
-#    include "list.h"
-
-
-struct pdcp_entity {
-  unsigned short             id;           // for resource management purpose
-  unsigned char              allocation;
-  void           *rlc_sap;
-  //-----------------------------
-  // C-SAP
-  //-----------------------------
-  list            c_sap;
-  //-----------------------------
-  // tranmission
-  //-----------------------------
-  list            input_sdu_list;
-  void           *rlc;
-  //-----------------------------
-  // receiver
-  //-----------------------------
-  //struct list     output_sdu_list;
-
-#ifdef ROHC
-  void            (*pdcp_process_input_sdus) (struct pdcp_entity *pdcpP, uint16_t data_sizeP, mem_block * sduP);
-#else
-  void            (*pdcp_process_input_sdus) (struct pdcp_entity *pdcpP);
-#endif
-
-  unsigned char              rb_id;        // for traces
-  unsigned char              rlc_type_sap; // am, um, tr
-
-  struct rb_dispatcher *rb_dispatch;
-};
-#endif
diff --git a/openair2/LAYER2/PDCP/pdcp_fifo.c b/openair2/LAYER2/PDCP/pdcp_fifo.c
deleted file mode 100755
index 9e6c185b9e91aa2f937837439e955b2059a080ab..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp_fifo.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*******************************************************************************
-
-  Eurecom OpenAirInterface
-  Copyright(c) 1999 - 2011 Eurecom
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope 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, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information
-  Openair Admin: openair_admin@eurecom.fr
-  Openair Tech : openair_tech@eurecom.fr
-  Forums       : http://forums.eurecom.fsr/openairinterface
-  Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
-
-*******************************************************************************/
-
-/*! \file pdcp_fifo.c
-* \brief pdcp interface with linux IP interface
-* \author  Lionel GAUTHIER and Navid Nikaein
-* \date 2009
-* \version 0.5
-* \warning This component can be runned only in user-space
-* @ingroup pdcp
-
-*/
-
-#define PDCP_FIFO_C
-#include "pdcp.h"
-#ifdef USER_MODE
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#define rtf_put write
-#define rtf_get read
-
-#else
-#include <rtai_fifos.h>
-#endif //USER_MODE
-
-
-#include "../MAC/extern.h"
-#include "SIMULATION/ETH_TRANSPORT/extern.h"
-
-#define PDCP_DEBUG 1
-
-//#define IDROMEL_NEMO 1
-
-#ifdef USER_MODE
-#include "UTIL/OCG/OCG.h"
-#include "UTIL/OCG/OCG_extern.h"
-#endif
-
-#ifdef PDCP_USE_NETLINK
-
-
-
-#include <sys/socket.h>
-#include <linux/netlink.h>
-
-
-
-extern struct sockaddr_nl nas_src_addr, nas_dest_addr;
-extern struct nlmsghdr* nas_nlh;
-extern struct iovec nas_iov;
-extern int nas_sock_fd;
-extern struct msghdr nas_msg;
-
-#define MAX_PAYLOAD 1600  /* maximum payload size*/
-
-unsigned char pdcp_read_state = 0;
-
-char pdcp_read_payload[MAX_PAYLOAD];
-#endif
-pdcp_data_req_header_t pdcp_read_header;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-int
-pdcp_fifo_flush_sdus ()
-{
-  //-----------------------------------------------------------------------------
-  mem_block_t*     sdu = list_get_head (&pdcp_sdu_list);
-  int             bytes_wrote = 0;
-  int             pdcp_nb_sdu_sent = 0;
-  uint8_t              cont = 1;
-  int ret;
-
-  while ((sdu) && (cont)) {
-#ifdef USER_MODE
-    // asjust the instance id when passing sdu to IP
-    ((pdcp_data_ind_header_t*)(sdu->data))->inst = (((pdcp_data_ind_header_t*)(sdu->data))->inst >= NB_eNB_INST) ?
-        ((pdcp_data_ind_header_t*)(sdu->data))->inst - NB_eNB_INST +oai_emulation.info.nb_enb_local - oai_emulation.info.first_ue_local : // UE
-        ((pdcp_data_ind_header_t*)(sdu->data))->inst - oai_emulation.info.first_ue_local;  // ENB
-#else
-    ((pdcp_data_ind_header_t*)(sdu->data))->inst = 0;
-#endif
-#ifdef PDCP_DEBUG
-    msg("[PDCP][INFO] PDCP->IP TTI %d INST %d: Preparing %d Bytes of data from rab %d to Nas_mesh\n",
-        Mac_rlc_xface->frame,
-        ((pdcp_data_ind_header_t*)(sdu->data))->inst,
-        ((pdcp_data_ind_header_t*)(sdu->data))->data_size,
-        ((pdcp_data_ind_header_t*)(sdu->data))->rb_id);
-#endif //PDCP_DEBUG
-    cont = 0;
-
-    if (!pdcp_output_sdu_bytes_to_write) {
-      if (!pdcp_output_header_bytes_to_write) {
-        pdcp_output_header_bytes_to_write = sizeof (pdcp_data_ind_header_t);
-      }
-
-#ifndef USER_MODE
-      bytes_wrote = rtf_put (PDCP2NW_DRIVER_FIFO,
-                             &(((uint8_t*) sdu->data)[sizeof (pdcp_data_ind_header_t) - pdcp_output_header_bytes_to_write]),
-                             pdcp_output_header_bytes_to_write);
-#else
-#ifdef PDCP_USE_NETLINK
-#ifdef LINUX
-      memcpy(NLMSG_DATA(nas_nlh), &(((uint8_t*) sdu->data)[sizeof (pdcp_data_ind_header_t) - pdcp_output_header_bytes_to_write]),
-             pdcp_output_header_bytes_to_write);
-      nas_nlh->nlmsg_len = pdcp_output_header_bytes_to_write;
-#endif //LINUX
-#endif //PDCP_USE_NETLINK
-      bytes_wrote = pdcp_output_header_bytes_to_write;
-#endif //USER_MODE
-#ifdef PDCP_DEBUG
-      msg("[PDCP][INFO] TTI %d Sent %d Bytes of header to Nas_mesh\n",
-          Mac_rlc_xface->frame,
-          bytes_wrote);
-#endif //PDCP_DEBUG
-
-      if (bytes_wrote > 0) {
-        pdcp_output_header_bytes_to_write = pdcp_output_header_bytes_to_write - bytes_wrote;
-
-        if (!pdcp_output_header_bytes_to_write) { // continue with sdu
-          pdcp_output_sdu_bytes_to_write = ((pdcp_data_ind_header_t*) sdu->data)->data_size;
-#ifndef USER_MODE
-          bytes_wrote = rtf_put (PDCP2NW_DRIVER_FIFO, &(sdu->data[sizeof (pdcp_data_ind_header_t)]), pdcp_output_sdu_bytes_to_write);
-#else
-#ifdef PDCP_USE_NETLINK
-#ifdef LINUX
-          memcpy(NLMSG_DATA(nas_nlh)+sizeof(pdcp_data_ind_header_t), &(sdu->data[sizeof (pdcp_data_ind_header_t)]), pdcp_output_sdu_bytes_to_write);
-          nas_nlh->nlmsg_len += pdcp_output_sdu_bytes_to_write;
-          ret = sendmsg(nas_sock_fd,&nas_msg,0);
-
-          if (ret<0) {
-            msg("[PDCP_FIFOS] sendmsg returns %d\n",ret);
-            perror("error code:");
-            mac_xface->macphy_exit("");
-            break;
-          }
-
-#endif // LINUX
-#endif //PDCP_USE_NETLINK
-          bytes_wrote= pdcp_output_sdu_bytes_to_write;
-#endif // USER_MODE
-#ifdef PDCP_DEBUG
-          msg("[PDCP][INFO] PDCP->IP TTI %d INST %d: Sent %d Bytes of data from rab %d to Nas_mesh\n",
-              Mac_rlc_xface->frame,
-              ((pdcp_data_ind_header_t*)(sdu->data))->inst,
-              bytes_wrote,
-              ((pdcp_data_ind_header_t*)(sdu->data))->rb_id);
-#endif //PDCP_DEBUG
-
-          if (bytes_wrote > 0) {
-            pdcp_output_sdu_bytes_to_write -= bytes_wrote;
-
-            if (!pdcp_output_sdu_bytes_to_write) { // OK finish with this SDU
-              // msg("rb sent a sdu qos_sap %d\n",sapiP);
-              list_remove_head (&pdcp_sdu_list);
-              free_mem_block (sdu);
-              cont = 1;
-              pdcp_nb_sdu_sent += 1;
-              sdu = list_get_head (&pdcp_sdu_list);
-            }
-
-          } else {
-            msg ("[PDCP] RADIO->IP SEND SDU CONGESTION!\n");
-          }
-
-        } else {
-          msg ("[PDCP] RADIO->IP SEND SDU CONGESTION!\n");
-        }
-      }
-
-    } else {
-      // continue writing sdu
-#ifndef USER_MODE
-      bytes_wrote = rtf_put (PDCP2NW_DRIVER_FIFO,
-                             (uint8_t*) (&(sdu->data[sizeof (pdcp_data_ind_header_t) + ((pdcp_data_ind_header_t*) sdu->data)->data_size - pdcp_output_sdu_bytes_to_write])),
-                             pdcp_output_sdu_bytes_to_write);
-#else  // USER_MODE
-      bytes_wrote = pdcp_output_sdu_bytes_to_write;
-#endif  // USER_MODE
-
-      if (bytes_wrote > 0) {
-        pdcp_output_sdu_bytes_to_write -= bytes_wrote;
-
-        if (!pdcp_output_sdu_bytes_to_write) {     // OK finish with this SDU
-          //PRINT_RB_SEND_OUTPUT_SDU ("[PDCP] RADIO->IP SEND SDU\n");
-          list_remove_head (&pdcp_sdu_list);
-          free_mem_block (sdu);
-          cont = 1;
-          pdcp_nb_sdu_sent += 1;
-          sdu = list_get_head (&pdcp_sdu_list);
-          // msg("rb sent a sdu from rab\n");
-        }
-      }
-    }
-  }
-
-#ifndef USER_MODE
-
-  if ((pdcp_nb_sdu_sent)) {
-    if ((pdcp_2_nas_irq > 0)) {
-#ifdef PDCP_DEBUG
-      msg("[PDCP][INFO] TTI %d : Trigger NAS RX interrupt\n",
-          Mac_rlc_xface->frame);
-#endif //PDCP_DEBUG
-      rt_pend_linux_srq (pdcp_2_nas_irq);
-
-    } else {
-      msg ("[PDCP] TTI %d: ERROR IF IP STACK WANTED : NOTIF PACKET(S) pdcp_2_nas_irq not initialized : %d\n",
-           Mac_rlc_xface->frame,
-           pdcp_2_nas_irq);
-    }
-  }
-
-#endif  //USER_MODE
-  return pdcp_nb_sdu_sent;
-}
-
-//-----------------------------------------------------------------------------
-/*
- * returns a positive value if whole bytes that had to be read were read
- * returns zero  value if whole bytes that had to be read were not read at all
- * returns a negative  value if an error was encountered while reading the rt fifo
- */
-int
-pdcp_fifo_read_input_sdus_remaining_bytes ()
-{
-  //-----------------------------------------------------------------------------
-  sdu_size_t             bytes_read=0;
-
-  if (pdcp_input_sdu_remaining_size_to_read > 0) {
-    // printk("[PDCP][INFO] read_input_sdus pdcp_input_sdu_remaining_size_to_read = %d \n", pdcp_input_sdu_remaining_size_to_read);
-    bytes_read = rtf_get (NW_DRIVER2PDCP_FIFO,
-                          &(pdcp_input_sdu_buffer[pdcp_input_sdu_size_read]),
-                          pdcp_input_sdu_remaining_size_to_read);
-
-    //printk("[PDCP][INFO] read fifo returned %d \n", bytes_read);
-    if (bytes_read > 0) {
-      //msg("[PDCP_FIFOS] Read %d remaining Bytes of data from Nas_mesh\n",bytes_read);
-      pdcp_input_sdu_remaining_size_to_read = pdcp_input_sdu_remaining_size_to_read - bytes_read;
-      pdcp_input_sdu_size_read = pdcp_input_sdu_size_read + bytes_read;
-
-      if (pdcp_input_sdu_remaining_size_to_read != 0) {
-        return 0;
-
-      } else {
-#ifdef PDCP_DEBUG
-        msg("[PDCP][INFO]  TTI %d: IP->RADIO RECEIVED COMPLETE SDU size %d inst %d rb %d\n",
-            Mac_rlc_xface->frame,
-            pdcp_input_sdu_size_read,
-            pdcp_input_header.inst,
-            pdcp_input_header.rb_id);
-#endif //PDCP_DEBUG
-        pdcp_input_sdu_size_read = 0;
-#ifdef IDROMEL_NEMO
-        pdcp_read_header.inst = 0;
-#endif
-        pdcp_data_req (pdcp_input_header.inst,
-                       pdcp_input_header.rb_id,
-                       pdcp_input_header.data_size,
-                       pdcp_input_sdu_buffer);
-        // not necessary
-        //memset(pdcp_input_sdu_buffer, 0, MAX_IP_PACKET_SIZE);
-        return 1;
-      }
-
-    } else {
-      return bytes_read;
-    }
-  }
-
-  return 1;
-}
-
-#ifndef PDCP_USE_NETLINK
-
-//-----------------------------------------------------------------------------
-int
-pdcp_fifo_read_input_sdus ()
-{
-  //-----------------------------------------------------------------------------
-  int             cont;
-  int             bytes_read;
-
-  // if remaining bytes to read
-  if (pdcp_fifo_read_input_sdus_remaining_bytes () > 0) {
-    // all bytes that had to be read for a SDU were read
-    // if not overflow of list, try to get new sdus from rt fifo
-    cont = 1;
-
-    while (cont > 0) {
-      bytes_read = rtf_get (NW_DRIVER2PDCP_FIFO,
-                            &(((uint8_t*) & pdcp_input_header)[pdcp_input_index_header]),
-                            sizeof (pdcp_data_req_header_t) - pdcp_input_index_header);
-
-      if (bytes_read > 0) {
-#ifdef PDCP_DEBUG
-        msg("[PDCP_FIFOS] TTI %d Read %d Bytes of data (header %d) from Nas_mesh\n",
-            Mac_rlc_xface->frame,
-            bytes_read,
-            sizeof(pdcp_data_req_header_t));
-#endif
-        pdcp_input_index_header += bytes_read;
-
-        if (pdcp_input_index_header == sizeof (pdcp_data_req_header_t)) {
-#ifdef PDCP_DEBUG
-          msg("[PDCP] TTI %d IP->RADIO READ HEADER sdu size %d\n",
-              Mac_rlc_xface->frame,
-              pdcp_input_header.data_size);
-#endif
-          pdcp_input_index_header = 0;
-
-          if (pdcp_input_header.data_size < 0) {
-            msg("[PDCP][FATAL ERROR] READ_FIFO: DATA_SIZE %d < 0\n",pdcp_input_header.data_size);
-            mac_xface->macphy_exit("");
-            return 0;
-          }
-
-          pdcp_input_sdu_remaining_size_to_read = pdcp_input_header.data_size;
-          pdcp_input_sdu_size_read     = 0;
-          // we know the size of the sdu, so read the sdu;
-          cont = pdcp_fifo_read_input_sdus_remaining_bytes ();
-
-        } else {
-          cont = 0;
-        }
-
-        // error while reading rt fifo
-
-      } else {
-        cont = 0;
-      }
-    }
-  }
-
-  return 0;
-}
-
-#else //PDCP_USE_NETLINK
-
-
-
-//-----------------------------------------------------------------------------
-int
-pdcp_fifo_read_input_sdus ()
-{
-  //-----------------------------------------------------------------------------
-  int             cont;
-  int             bytes_read;
-  int len;
-
-  if (pdcp_read_state == 0) {
-#ifdef LINUX
-    len = recvmsg(nas_sock_fd, &nas_msg, 0);
-#else
-    len = -1;
-#endif
-
-    if (len<0) {
-      //printf("[PDCP][NETLINK %d] nothing in pdcp NAS socket\n", nas_sock_fd);
-    } else {
-#ifdef PDCP_DEBUG
-#ifdef LINUX
-      printf("[PDCP][NETLINK] Received socket with length %d (nlmsg_len = %d)\n",len,nas_nlh->nlmsg_len-sizeof(struct nlmsghdr));
-#endif PDCP_DEBUG
-#ifdef PDCP_DEBUG
-      printf("[PDCP][NETLINK] nlmsg_len = %d (%d,%d)\n",nas_nlh->nlmsg_len,
-             sizeof(pdcp_data_req_header_t),
-             sizeof(struct nlmsghdr));
-#endif LINUX
-#endif PDCP_DEBUG
-    }
-
-#ifdef LINUX
-
-    if (nas_nlh->nlmsg_len == sizeof (pdcp_data_req_header_t) + sizeof(struct nlmsghdr)) {
-      pdcp_read_state = 1;  //get
-      memcpy((void*)&pdcp_read_header,
-             (void*)NLMSG_DATA(nas_nlh),
-             sizeof(pdcp_data_req_header_t));
-    }
-
-#else //LINUX
-    pdcp_read_state = 1;
-#endif //LINUX
-  }
-
-  if (pdcp_read_state == 1) {
-#ifdef LINUX
-    len = recvmsg(nas_sock_fd, &nas_msg, 0);
-#else
-    len = -1;
-#endif //LINUX
-
-    if (len<0) {
-      // nothing in pdcp NAS socket
-    } else {
-      pdcp_read_state = 0;
-      //print_active_requests()
-#ifdef LINUX
-      memcpy(pdcp_read_payload,
-             (unsigned char*)NLMSG_DATA(nas_nlh),
-             nas_nlh->nlmsg_len - sizeof(struct nlmsghdr));
-#endif
-#ifdef IDROMEL_NEMO
-      pdcp_read_header.inst = 0;
-#endif
-      pdcp_read_header.inst = (pdcp_read_header.inst >= oai_emulation.info.nb_enb_local) ?
-                              pdcp_read_header.inst - oai_emulation.info.nb_enb_local+ NB_eNB_INST + oai_emulation.info.first_ue_local :
-                              pdcp_read_header.inst +  oai_emulation.info.first_enb_local;
-#ifdef PDCP_DEBUG
-      printf("[PDCP][NETLINK][IP->PDCP] TTI %d, INST %d: Received socket with length %d (nlmsg_len = %d) on Rab %d \n",
-             Mac_rlc_xface->frame,
-             pdcp_read_header.inst,
-             len,
-             nas_nlh->nlmsg_len-sizeof(struct nlmsghdr),
-             pdcp_read_header.rb_id);
-#endif PDCP_DEBUG
-      pdcp_data_req(pdcp_read_header.inst,
-                    pdcp_read_header.rb_id,
-                    pdcp_read_header.data_size,
-                    pdcp_read_payload);
-    }
-  }
-}
-#endif
diff --git a/openair2/LAYER2/PDCP/pdcp_primitives.h b/openair2/LAYER2/PDCP/pdcp_primitives.h
deleted file mode 100755
index 99210303d85e450dfbc74331be1b960ee1248a96..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp_primitives.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-                             pdcp_primitives.h
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
-
- ***************************************************************************/
-#ifndef __PDCP_PRIMITIVES_H__
-#    define __PDCP_PRIMITIVES_H__
-
-#    include "platform.h"
-//----------------------------------------------------------
-// primitives
-//----------------------------------------------------------
-#    define PDCP_DATA_REQ     0x01
-#    define PDCP_DATA_IND     0x02
-//----------------------------------------------------------
-// control primitives
-//----------------------------------------------------------
-#    define CPDCP_CONFIG_REQ  0x04
-#    define CPDCP_RELEASE_REQ 0x08
-#    define CPDCP_SN_REQ      0x10
-#    define CPDCP_RELOC_REQ   0x20
-#    define CPDCP_RELOC_CNF   0x40
-//----------------------------------------------------------
-// primitives definition
-//----------------------------------------------------------
-struct pdcp_data_req {
-  uint16_t             rb_id;
-  uint16_t             data_size;
-};
-struct pdcp_data_ind {
-  uint16_t             rb_id;
-  uint16_t             data_size;
-};
-
-//----------------------------------------------------------
-// control primitives definition
-//----------------------------------------------------------
-// TO DO
-struct cpdcp_config_req {
-  void           *rlc_sap;
-  uint8_t              rlc_type_sap; // am, um, tr
-  uint8_t              header_compression_type;
-};
-struct cpdcp_release_req {
-  void           *rlc_sap;
-};
-
-struct cpdcp_sn_req {
-  uint32_t             sn;
-};
-
-struct cpdcp_relloc_req {
-  uint32_t             receive_sn;
-};
-
-struct cpdcp_relloc_conf {
-  uint32_t             receive_sn;
-  uint32_t             send_sn;
-};
-
-struct cpdcp_primitive {
-  uint8_t              type;
-  union {
-    struct cpdcp_config_req config_req;
-    struct cpdcp_release_req release_req;
-    struct cpdcp_sn_req sn_req;
-    struct cpdcp_relloc_req relloc_req;
-    struct cpdcp_relloc_conf relloc_conf;
-  } primitive;
-};
-
-
-#endif
diff --git a/openair2/LAYER2/PDCP/pdcp_proto_extern.h b/openair2/LAYER2/PDCP/pdcp_proto_extern.h
deleted file mode 100755
index 5944ef05f75fe55d01ee580e3137f6d87c4b178d..0000000000000000000000000000000000000000
--- a/openair2/LAYER2/PDCP/pdcp_proto_extern.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-                             pdcp_proto_extern.h
-                             -------------------
-  AUTHOR  : Lionel GAUTHIER
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr
-
- ***************************************************************************/
-#ifndef __PDCP_PROTO_EXTERN_H__
-#    define __PDCP_PROTO_EXTERN_H__
-
-//#    include "pdcp_entity.h"
-//#    include "rb_mux.h"
-#    include "mem_block.h"
-
-#ifdef ROHC
-extern void     pdcp_data_ind (module_id_t module_idP, rb_id_t rab_idP, sdu_size_t data_sizeP, mem_block_t * sduP);
-extern void     pdcp_data_req (struct pdcp_entity *pdcpP, mem_block * sduP);
-extern void     send_pdcp_control_primitive (struct pdcp_entity *pdcpP, mem_block * cprimitiveP);
-extern void     control_pdcp (struct pdcp_entity *pdcpP);
-extern void pdcp_process_input_sdus_high(struct pdcp_entity *pdcpP);
-extern void     pdcp_process_input_sdus_am (struct pdcp_entity *pdcpP, uint16_t data_sizeP, mem_block * sduP);
-extern void     pdcp_process_output_sdus (struct pdcp_entity *pdcpP, mem_block * sduP, uint8_t rb_idP);
-extern void   pdcp_process_output_sdus_high (struct pdcp_entity *pdcpP, mem_block * sduP, uint16_t data_sizeP,  uint16_t rb_idP);
-extern void     pdcp_process_input_sdus_um (struct pdcp_entity *pdcpP, uint16_t data_sizeP, mem_block * sduP);
-extern void     pdcp_process_input_sdus_tr (struct pdcp_entity *pdcpP, uint16_t data_sizeP, mem_block * sduP);
-extern void     init_pdcp (struct pdcp_entity *pdcpP, struct rb_dispatcher *rbP, uint8_t rb_idP);
-extern void    *pdcp_tx (struct pdcp_entity *pdcpP, uint16_t data_sizeP, mem_block * sduP);
-extern int  reception_from_rohc_mt(void);
-extern int  reception_from_rohc_bs(void);
-#else
-extern void     pdcp_data_ind (module_id_t module_idP, rb_id_t rab_idP, sdu_size_t data_sizeP, mem_block_t * sduP);
-extern void     pdcp_data_req (struct pdcp_entity *pdcpP, mem_block * sduP);
-extern void     send_pdcp_control_primitive (struct pdcp_entity *pdcpP, mem_block * cprimitiveP);
-extern void     control_pdcp (struct pdcp_entity *pdcpP);
-extern void     pdcp_process_input_sdus_am (struct pdcp_entity *pdcpP);
-extern void     pdcp_process_output_sdus (struct pdcp_entity *pdcpP, mem_block * sduP, uint8_t rb_idP);
-extern void     pdcp_process_input_sdus_um (struct pdcp_entity *pdcpP);
-extern void     pdcp_process_input_sdus_tr (struct pdcp_entity *pdcpP);
-extern void     init_pdcp (struct pdcp_entity *pdcpP, struct rb_dispatcher *rbP, uint8_t rb_idP);
-extern void    *pdcp_tx (void *argP);
-#endif
-#endif