diff --git a/.gitmodules b/.gitmodules
index 5cdec8ab64..df1103239d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "aion_fastvm"]
     path = aion_fastvm
     url = https://github.com/aionnetwork/aion_fastvm
-    branch = master 
+    branch = relicense 
 [submodule "aion_api"]
     path = aion_api
     url = https://github.com/aionnetwork/aion_api
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 0000000000..eb82c068d0
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,16 @@
+Aion foundation
+EthereumJ community:
+    Roman Mandeleil
+    Anton Nashatyrev
+    Nick Savers
+Equihash solver:
+    John Tromp
+BLAKE2 implementation:
+    Samuel Neves
+Ethereum Harmony community
+Zcash project community
+Bitcoinj community
+H2 Group
+Centrys.
+Santiago Gonzalez Toral
+Timur Badretdinov
diff --git a/LICENSE b/LICENSE
index f288702d2f..d936838030 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://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 <https://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
-<https://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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+The MIT License
+
+Copyright (c) 2018 Aion Foundation https://aion.network/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/aion_fastvm b/aion_fastvm
index e1414ca4d4..f3d846e983 160000
--- a/aion_fastvm
+++ b/aion_fastvm
@@ -1 +1 @@
-Subproject commit e1414ca4d4ca06e2da665c21b5620a39c97354cd
+Subproject commit f3d846e9834682c10e89fcaa1832c1ab2957cda8
diff --git a/build.gradle b/build.gradle
index 2d7ffd5cd4..d16963fe99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,7 @@ def javaHome = System.getProperty('java.home')
 def vmVersion = "0.3.2"
 def dirRuntimeJars = 'jars' // we'll store mod and lib stuff in here
 
+
 allprojects { 
 
     apply plugin: 'java'
@@ -251,11 +252,14 @@ build {
 task prePack(type:Exec)  {
     dependsOn ':aion_api:cleanPack' 
     dependsOn ':aion_api:build'
-    if (project.hasProperty('noGui')) {
-        environment "noGui", "true"
+
+    if(findProject(":modGui") != null && gradle.useGui) { 
+        dependsOn ':modGui:setupAionRootProject';
+        environment "useGui", "true"
     }
     commandLine 'bash', 'script/prepack.sh' 
 }
+
 task postPack(type:Exec) { commandLine 'sh', 'script/postpack.sh' }
 
 /** Replaces `ant pack_build` */
@@ -277,9 +281,6 @@ task pack(type: Tar) {
     into('/aion/') { 
         from dirWorkspace
         include 'aion.sh'
-        if (!project.hasProperty('noGui')) {
-            include 'aion_gui.sh'
-        }
     }
     into('/aion/native') {
         from dirNative
diff --git a/gradle.properties b/gradle.properties
index 50611691d0..a696b84724 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,3 +2,6 @@ org.gradle.java.home=/usr/lib/jvm/jdk-11.0.1
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=4g -XX:ReservedCodeCacheSize=1024m
 org.gradle.parallel=false
+
+# Uncomment to include modGui in build 
+# modGuiPath=modGui
diff --git a/modAion/src/org/aion/zero/api/BlockConstants.java b/modAion/src/org/aion/zero/api/BlockConstants.java
index 93539ae7bb..e260fad3f5 100644
--- a/modAion/src/org/aion/zero/api/BlockConstants.java
+++ b/modAion/src/org/aion/zero/api/BlockConstants.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.api;
 
 import java.math.BigInteger;
diff --git a/modAion/src/org/aion/zero/db/AionContractDetailsImpl.java b/modAion/src/org/aion/zero/db/AionContractDetailsImpl.java
index 3edd2dbf0d..690e8d83b8 100644
--- a/modAion/src/org/aion/zero/db/AionContractDetailsImpl.java
+++ b/modAion/src/org/aion/zero/db/AionContractDetailsImpl.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.db;
 
 import static org.aion.base.util.ByteArrayWrapper.wrap;
diff --git a/modAion/src/org/aion/zero/db/AionRepositoryCache.java b/modAion/src/org/aion/zero/db/AionRepositoryCache.java
index 4806638842..8b5eb24d1a 100644
--- a/modAion/src/org/aion/zero/db/AionRepositoryCache.java
+++ b/modAion/src/org/aion/zero/db/AionRepositoryCache.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.db;
 
 import java.util.HashMap;
diff --git a/modAion/src/org/aion/zero/exceptions/HeaderStructureException.java b/modAion/src/org/aion/zero/exceptions/HeaderStructureException.java
index dc979a6f7e..6e9da355d8 100644
--- a/modAion/src/org/aion/zero/exceptions/HeaderStructureException.java
+++ b/modAion/src/org/aion/zero/exceptions/HeaderStructureException.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.exceptions;
 
 /**
diff --git a/modAion/src/org/aion/zero/types/A0BlockHeader.java b/modAion/src/org/aion/zero/types/A0BlockHeader.java
index 330db39d08..54220bd04d 100644
--- a/modAion/src/org/aion/zero/types/A0BlockHeader.java
+++ b/modAion/src/org/aion/zero/types/A0BlockHeader.java
@@ -1,30 +1,8 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import static org.aion.base.util.ByteUtil.longToBytes;
 import static org.aion.base.util.ByteUtil.merge;
+import static org.aion.base.util.ByteUtil.oneByteToHexString;
 import static org.aion.base.util.ByteUtil.toHexString;
 import static org.aion.crypto.HashUtil.EMPTY_TRIE_HASH;
 
@@ -69,7 +47,7 @@ public class A0BlockHeader extends AbstractBlockHeader implements IPowBlockHeade
     // TODO: Update this
     public JSONObject toJSON() {
         JSONObject obj = new JSONObject();
-        obj.putOpt("version", toHexString(this.parentHash));
+        obj.putOpt("version", oneByteToHexString(this.version));
         obj.putOpt("number", toHexString(longToBytes(this.number)));
         obj.putOpt("parentHash", toHexString(this.parentHash));
         obj.putOpt("coinBase", toHexString(this.coinbase.toBytes()));
diff --git a/modAion/src/org/aion/zero/types/A0BlockHeaderVersion.java b/modAion/src/org/aion/zero/types/A0BlockHeaderVersion.java
index e70d6c73f3..7b4f8a66e3 100644
--- a/modAion/src/org/aion/zero/types/A0BlockHeaderVersion.java
+++ b/modAion/src/org/aion/zero/types/A0BlockHeaderVersion.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.types;
 
 import java.util.HashSet;
diff --git a/modAion/src/org/aion/zero/types/AionInternalTx.java b/modAion/src/org/aion/zero/types/AionInternalTx.java
index ce0551dab0..6928ddec56 100644
--- a/modAion/src/org/aion/zero/types/AionInternalTx.java
+++ b/modAion/src/org/aion/zero/types/AionInternalTx.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import static org.aion.base.util.ByteUtil.toHexString;
diff --git a/modAion/src/org/aion/zero/types/AionPendingTx.java b/modAion/src/org/aion/zero/types/AionPendingTx.java
index 2e5e6ea218..c8dbc0c857 100644
--- a/modAion/src/org/aion/zero/types/AionPendingTx.java
+++ b/modAion/src/org/aion/zero/types/AionPendingTx.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import java.math.BigInteger;
diff --git a/modAion/src/org/aion/zero/types/AionTransaction.java b/modAion/src/org/aion/zero/types/AionTransaction.java
index 67f6f6bfab..43d68e6c4d 100644
--- a/modAion/src/org/aion/zero/types/AionTransaction.java
+++ b/modAion/src/org/aion/zero/types/AionTransaction.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import static org.aion.base.util.ByteUtil.ZERO_BYTE_ARRAY;
diff --git a/modAion/src/org/aion/zero/types/AionTxExecSummary.java b/modAion/src/org/aion/zero/types/AionTxExecSummary.java
index d255ffd83d..e6b924adcc 100644
--- a/modAion/src/org/aion/zero/types/AionTxExecSummary.java
+++ b/modAion/src/org/aion/zero/types/AionTxExecSummary.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import static java.util.Collections.emptyList;
diff --git a/modAion/src/org/aion/zero/types/AionTxReceipt.java b/modAion/src/org/aion/zero/types/AionTxReceipt.java
index 449d815198..eb1de0ad49 100644
--- a/modAion/src/org/aion/zero/types/AionTxReceipt.java
+++ b/modAion/src/org/aion/zero/types/AionTxReceipt.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modAion/src/org/aion/zero/types/IAionBlock.java b/modAion/src/org/aion/zero/types/IAionBlock.java
index 70fdea6ab6..32e68542c0 100644
--- a/modAion/src/org/aion/zero/types/IAionBlock.java
+++ b/modAion/src/org/aion/zero/types/IAionBlock.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.types;
 
 import java.math.BigInteger;
diff --git a/modAion/test/org/aion/types/AionTransactionTest.java b/modAion/test/org/aion/types/AionTransactionTest.java
index 7aa21decbd..dfbe8cfbec 100644
--- a/modAion/test/org/aion/types/AionTransactionTest.java
+++ b/modAion/test/org/aion/types/AionTransactionTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.types;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modAion/test/org/aion/types/AionTxReceiptTest.java b/modAion/test/org/aion/types/AionTxReceiptTest.java
index db5e5f2098..52c0adbefb 100644
--- a/modAion/test/org/aion/types/AionTxReceiptTest.java
+++ b/modAion/test/org/aion/types/AionTxReceiptTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.types;
 
 import static org.hamcrest.Matchers.equalTo;
diff --git a/modAionBase/src/org/aion/base/db/DetailsProvider.java b/modAionBase/src/org/aion/base/db/DetailsProvider.java
index 1ab8285c64..76d7cdc14f 100644
--- a/modAionBase/src/org/aion/base/db/DetailsProvider.java
+++ b/modAionBase/src/org/aion/base/db/DetailsProvider.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 /**
diff --git a/modAionBase/src/org/aion/base/db/Flushable.java b/modAionBase/src/org/aion/base/db/Flushable.java
index 5ccce8da5c..5460582228 100644
--- a/modAionBase/src/org/aion/base/db/Flushable.java
+++ b/modAionBase/src/org/aion/base/db/Flushable.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 public interface Flushable {
diff --git a/modAionBase/src/org/aion/base/db/IByteArrayKeyValueDatabase.java b/modAionBase/src/org/aion/base/db/IByteArrayKeyValueDatabase.java
index 431057c4a3..7acc2eb139 100644
--- a/modAionBase/src/org/aion/base/db/IByteArrayKeyValueDatabase.java
+++ b/modAionBase/src/org/aion/base/db/IByteArrayKeyValueDatabase.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 public interface IByteArrayKeyValueDatabase extends IByteArrayKeyValueStore, IDatabase {}
diff --git a/modAionBase/src/org/aion/base/db/IByteArrayKeyValueStore.java b/modAionBase/src/org/aion/base/db/IByteArrayKeyValueStore.java
index bf08d031a9..acabb1fab0 100644
--- a/modAionBase/src/org/aion/base/db/IByteArrayKeyValueStore.java
+++ b/modAionBase/src/org/aion/base/db/IByteArrayKeyValueStore.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 public interface IByteArrayKeyValueStore extends IKeyValueStore<byte[], byte[]> {}
diff --git a/modAionBase/src/org/aion/base/db/IContractDetails.java b/modAionBase/src/org/aion/base/db/IContractDetails.java
index 46876ba942..30504f2d03 100644
--- a/modAionBase/src/org/aion/base/db/IContractDetails.java
+++ b/modAionBase/src/org/aion/base/db/IContractDetails.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.util.Collection;
diff --git a/modAionBase/src/org/aion/base/db/IDatabase.java b/modAionBase/src/org/aion/base/db/IDatabase.java
index 4d93eb6d88..12b6726532 100644
--- a/modAionBase/src/org/aion/base/db/IDatabase.java
+++ b/modAionBase/src/org/aion/base/db/IDatabase.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.util.Optional;
diff --git a/modAionBase/src/org/aion/base/db/IKeyValueStore.java b/modAionBase/src/org/aion/base/db/IKeyValueStore.java
index ba63ef7d41..cbde9f3461 100644
--- a/modAionBase/src/org/aion/base/db/IKeyValueStore.java
+++ b/modAionBase/src/org/aion/base/db/IKeyValueStore.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.util.Collection;
diff --git a/modAionBase/src/org/aion/base/db/IPruneConfig.java b/modAionBase/src/org/aion/base/db/IPruneConfig.java
index f0b9f726d2..3b93b1fb50 100644
--- a/modAionBase/src/org/aion/base/db/IPruneConfig.java
+++ b/modAionBase/src/org/aion/base/db/IPruneConfig.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.db;
 
 /**
diff --git a/modAionBase/src/org/aion/base/db/IRepository.java b/modAionBase/src/org/aion/base/db/IRepository.java
index f4d05a1ae9..90cab5ffe9 100644
--- a/modAionBase/src/org/aion/base/db/IRepository.java
+++ b/modAionBase/src/org/aion/base/db/IRepository.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.util.Map;
diff --git a/modAionBase/src/org/aion/base/db/IRepositoryCache.java b/modAionBase/src/org/aion/base/db/IRepositoryCache.java
index 8193702cc8..9871cf9589 100644
--- a/modAionBase/src/org/aion/base/db/IRepositoryCache.java
+++ b/modAionBase/src/org/aion/base/db/IRepositoryCache.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/db/IRepositoryConfig.java b/modAionBase/src/org/aion/base/db/IRepositoryConfig.java
index eed166a8ac..2a6566a31c 100644
--- a/modAionBase/src/org/aion/base/db/IRepositoryConfig.java
+++ b/modAionBase/src/org/aion/base/db/IRepositoryConfig.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.util.Properties;
diff --git a/modAionBase/src/org/aion/base/db/IRepositoryQuery.java b/modAionBase/src/org/aion/base/db/IRepositoryQuery.java
index 2c4c307ffd..b02248cbbf 100644
--- a/modAionBase/src/org/aion/base/db/IRepositoryQuery.java
+++ b/modAionBase/src/org/aion/base/db/IRepositoryQuery.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.db;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/io/File.java b/modAionBase/src/org/aion/base/io/File.java
index fabfeaf005..37e4b949cf 100644
--- a/modAionBase/src/org/aion/base/io/File.java
+++ b/modAionBase/src/org/aion/base/io/File.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.io;
 
 import java.nio.file.Path;
diff --git a/modAionBase/src/org/aion/base/timer/ITimer.java b/modAionBase/src/org/aion/base/timer/ITimer.java
index a098d629bd..400864c9c9 100644
--- a/modAionBase/src/org/aion/base/timer/ITimer.java
+++ b/modAionBase/src/org/aion/base/timer/ITimer.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.timer;
 
 /**
diff --git a/modAionBase/src/org/aion/base/timer/PoisonPillTask.java b/modAionBase/src/org/aion/base/timer/PoisonPillTask.java
index a946997e35..8415a1a14e 100644
--- a/modAionBase/src/org/aion/base/timer/PoisonPillTask.java
+++ b/modAionBase/src/org/aion/base/timer/PoisonPillTask.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.timer;
 
 /**
diff --git a/modAionBase/src/org/aion/base/timer/StackTimer.java b/modAionBase/src/org/aion/base/timer/StackTimer.java
index 548540d5a6..506e7f1e7d 100644
--- a/modAionBase/src/org/aion/base/timer/StackTimer.java
+++ b/modAionBase/src/org/aion/base/timer/StackTimer.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.timer;
 
 import java.util.concurrent.ExecutorService;
diff --git a/modAionBase/src/org/aion/base/timer/StackTimerRunnable.java b/modAionBase/src/org/aion/base/timer/StackTimerRunnable.java
index 1a7bbf5101..047e497c4e 100644
--- a/modAionBase/src/org/aion/base/timer/StackTimerRunnable.java
+++ b/modAionBase/src/org/aion/base/timer/StackTimerRunnable.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.timer;
 
 import java.util.ArrayDeque;
diff --git a/modAionBase/src/org/aion/base/timer/TimerDummy.java b/modAionBase/src/org/aion/base/timer/TimerDummy.java
index 14604ac86f..dc41dff7c2 100644
--- a/modAionBase/src/org/aion/base/timer/TimerDummy.java
+++ b/modAionBase/src/org/aion/base/timer/TimerDummy.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.timer;
 
 /**
diff --git a/modAionBase/src/org/aion/base/timer/TimerTask.java b/modAionBase/src/org/aion/base/timer/TimerTask.java
index ef231c3a13..113903ad4c 100644
--- a/modAionBase/src/org/aion/base/timer/TimerTask.java
+++ b/modAionBase/src/org/aion/base/timer/TimerTask.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
diff --git a/modAionBase/src/org/aion/base/type/Address.java b/modAionBase/src/org/aion/base/type/Address.java
index 719920672d..6e5ce8293a 100644
--- a/modAionBase/src/org/aion/base/type/Address.java
+++ b/modAionBase/src/org/aion/base/type/Address.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 import java.util.Arrays;
diff --git a/modAionBase/src/org/aion/base/type/Hash256.java b/modAionBase/src/org/aion/base/type/Hash256.java
index 6ce4a035c5..4609cddc38 100644
--- a/modAionBase/src/org/aion/base/type/Hash256.java
+++ b/modAionBase/src/org/aion/base/type/Hash256.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 import java.util.Arrays;
diff --git a/modAionBase/src/org/aion/base/type/IBlock.java b/modAionBase/src/org/aion/base/type/IBlock.java
index 29f148bf0c..63e71be8b9 100644
--- a/modAionBase/src/org/aion/base/type/IBlock.java
+++ b/modAionBase/src/org/aion/base/type/IBlock.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 /*
  * @Copyright Nuco Inc. 2016
  * @Author jin@nuco.io *
diff --git a/modAionBase/src/org/aion/base/type/IBlockHeader.java b/modAionBase/src/org/aion/base/type/IBlockHeader.java
index 201b49277e..e168eb08f0 100644
--- a/modAionBase/src/org/aion/base/type/IBlockHeader.java
+++ b/modAionBase/src/org/aion/base/type/IBlockHeader.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 /** @author jay */
diff --git a/modAionBase/src/org/aion/base/type/IBlockIdentifier.java b/modAionBase/src/org/aion/base/type/IBlockIdentifier.java
index 3291139a83..bea6979de9 100644
--- a/modAionBase/src/org/aion/base/type/IBlockIdentifier.java
+++ b/modAionBase/src/org/aion/base/type/IBlockIdentifier.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 /** @author jay */
diff --git a/modAionBase/src/org/aion/base/type/IBlockSummary.java b/modAionBase/src/org/aion/base/type/IBlockSummary.java
index 06dc8b7a43..8d300e3e92 100644
--- a/modAionBase/src/org/aion/base/type/IBlockSummary.java
+++ b/modAionBase/src/org/aion/base/type/IBlockSummary.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 import java.util.List;
diff --git a/modAionBase/src/org/aion/base/type/IExecutionResult.java b/modAionBase/src/org/aion/base/type/IExecutionResult.java
index eb60494235..c0e0d1b293 100644
--- a/modAionBase/src/org/aion/base/type/IExecutionResult.java
+++ b/modAionBase/src/org/aion/base/type/IExecutionResult.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.type;
 
 public interface IExecutionResult {
diff --git a/modAionBase/src/org/aion/base/type/IPowBlockHeader.java b/modAionBase/src/org/aion/base/type/IPowBlockHeader.java
index 9dfa4d3f0a..85fbaf10e1 100644
--- a/modAionBase/src/org/aion/base/type/IPowBlockHeader.java
+++ b/modAionBase/src/org/aion/base/type/IPowBlockHeader.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/type/ISolution.java b/modAionBase/src/org/aion/base/type/ISolution.java
index bae6655c9e..04fd8797a1 100644
--- a/modAionBase/src/org/aion/base/type/ISolution.java
+++ b/modAionBase/src/org/aion/base/type/ISolution.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 /** Interface for any PoW and PoI miner solution. */
diff --git a/modAionBase/src/org/aion/base/type/ITransaction.java b/modAionBase/src/org/aion/base/type/ITransaction.java
index caf582bbee..75f0cb0109 100644
--- a/modAionBase/src/org/aion/base/type/ITransaction.java
+++ b/modAionBase/src/org/aion/base/type/ITransaction.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.type;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/type/ITxExecSummary.java b/modAionBase/src/org/aion/base/type/ITxExecSummary.java
index d341587aa5..1589e0722b 100644
--- a/modAionBase/src/org/aion/base/type/ITxExecSummary.java
+++ b/modAionBase/src/org/aion/base/type/ITxExecSummary.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.type;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/type/ITxReceipt.java b/modAionBase/src/org/aion/base/type/ITxReceipt.java
index ea32d77eaa..728d3a4c66 100644
--- a/modAionBase/src/org/aion/base/type/ITxReceipt.java
+++ b/modAionBase/src/org/aion/base/type/ITxReceipt.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.type;
 
 import java.util.List;
diff --git a/modAionBase/src/org/aion/base/util/AbstractMap.java b/modAionBase/src/org/aion/base/util/AbstractMap.java
index 6a6b696703..6874fd1c2c 100644
--- a/modAionBase/src/org/aion/base/util/AbstractMap.java
+++ b/modAionBase/src/org/aion/base/util/AbstractMap.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.util.AbstractCollection;
diff --git a/modAionBase/src/org/aion/base/util/BIUtil.java b/modAionBase/src/org/aion/base/util/BIUtil.java
index e3e84af490..7ad7e5796e 100644
--- a/modAionBase/src/org/aion/base/util/BIUtil.java
+++ b/modAionBase/src/org/aion/base/util/BIUtil.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/util/ByteArrayMap.java b/modAionBase/src/org/aion/base/util/ByteArrayMap.java
index fb7e3f5164..f707910339 100644
--- a/modAionBase/src/org/aion/base/util/ByteArrayMap.java
+++ b/modAionBase/src/org/aion/base/util/ByteArrayMap.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.util.Arrays;
diff --git a/modAionBase/src/org/aion/base/util/ByteArrayWrapper.java b/modAionBase/src/org/aion/base/util/ByteArrayWrapper.java
index 62214119ae..67d9e10fd8 100644
--- a/modAionBase/src/org/aion/base/util/ByteArrayWrapper.java
+++ b/modAionBase/src/org/aion/base/util/ByteArrayWrapper.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.io.Serializable;
diff --git a/modAionBase/src/org/aion/base/util/ByteUtil.java b/modAionBase/src/org/aion/base/util/ByteUtil.java
index 7ec6b8daf0..ddfa984950 100644
--- a/modAionBase/src/org/aion/base/util/ByteUtil.java
+++ b/modAionBase/src/org/aion/base/util/ByteUtil.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.io.ByteArrayOutputStream;
@@ -44,6 +9,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+/** @apiNote This functionality is migrated to modUtil. Use that class instead. */
+@Deprecated
 public class ByteUtil {
 
     public static final byte[] EMPTY_WORD = new byte[32];
diff --git a/modAionBase/src/org/aion/base/util/Bytesable.java b/modAionBase/src/org/aion/base/util/Bytesable.java
index 5fd99b8862..ae6bc4189a 100644
--- a/modAionBase/src/org/aion/base/util/Bytesable.java
+++ b/modAionBase/src/org/aion/base/util/Bytesable.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 /** @author jin */
diff --git a/modAionBase/src/org/aion/base/util/Copyable.java b/modAionBase/src/org/aion/base/util/Copyable.java
index 05de01ddcb..5a3dc0daec 100644
--- a/modAionBase/src/org/aion/base/util/Copyable.java
+++ b/modAionBase/src/org/aion/base/util/Copyable.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 /**
diff --git a/modAionBase/src/org/aion/base/util/ExecutorPipeline.java b/modAionBase/src/org/aion/base/util/ExecutorPipeline.java
index 4d384cd46e..399d18e3d8 100644
--- a/modAionBase/src/org/aion/base/util/ExecutorPipeline.java
+++ b/modAionBase/src/org/aion/base/util/ExecutorPipeline.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.util.HashMap;
diff --git a/modAionBase/src/org/aion/base/util/FastByteComparisons.java b/modAionBase/src/org/aion/base/util/FastByteComparisons.java
index 8f1463e947..1cbfb79740 100644
--- a/modAionBase/src/org/aion/base/util/FastByteComparisons.java
+++ b/modAionBase/src/org/aion/base/util/FastByteComparisons.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.util.Arrays;
diff --git a/modAionBase/src/org/aion/base/util/Functional.java b/modAionBase/src/org/aion/base/util/Functional.java
index 1a0e158100..1bfd9fb3eb 100644
--- a/modAionBase/src/org/aion/base/util/Functional.java
+++ b/modAionBase/src/org/aion/base/util/Functional.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 public interface Functional {
diff --git a/modAionBase/src/org/aion/base/util/HashMap.java b/modAionBase/src/org/aion/base/util/HashMap.java
index 814ed0f6d0..a3f6547012 100644
--- a/modAionBase/src/org/aion/base/util/HashMap.java
+++ b/modAionBase/src/org/aion/base/util/HashMap.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.io.IOException;
diff --git a/modAionBase/src/org/aion/base/util/Hex.java b/modAionBase/src/org/aion/base/util/Hex.java
index 1a79fd8aab..0fb02b3ae4 100644
--- a/modAionBase/src/org/aion/base/util/Hex.java
+++ b/modAionBase/src/org/aion/base/util/Hex.java
@@ -1,45 +1,15 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-/** Utility class for converting hex data to bytes and back again. */
+/**
+ * Utility class for converting hex data to bytes and back again.
+ *
+ * @apiNote This functionality is migrated to modUtil. Use that class instead.
+ */
+@Deprecated
 public class Hex {
 
     private static final HexEncoder encoder = new HexEncoder();
diff --git a/modAionBase/src/org/aion/base/util/HexEncoder.java b/modAionBase/src/org/aion/base/util/HexEncoder.java
index d3e43e063f..f8d688f406 100644
--- a/modAionBase/src/org/aion/base/util/HexEncoder.java
+++ b/modAionBase/src/org/aion/base/util/HexEncoder.java
@@ -1,44 +1,14 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-/** A streaming Hex encoder. */
+/**
+ * A streaming Hex encoder.
+ *
+ * @apiNote This functionality is migrated to modUtil. Use that class instead.
+ */
+@Deprecated
 public class HexEncoder {
 
     protected final byte[] encodingTable = {
diff --git a/modAionBase/src/org/aion/base/util/ImmutableByteArrayWrapper.java b/modAionBase/src/org/aion/base/util/ImmutableByteArrayWrapper.java
index b763483a8f..3c526c039b 100644
--- a/modAionBase/src/org/aion/base/util/ImmutableByteArrayWrapper.java
+++ b/modAionBase/src/org/aion/base/util/ImmutableByteArrayWrapper.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.util.Arrays;
diff --git a/modAionBase/src/org/aion/base/util/MAF.java b/modAionBase/src/org/aion/base/util/MAF.java
index 810daa5559..bfadee0d60 100644
--- a/modAionBase/src/org/aion/base/util/MAF.java
+++ b/modAionBase/src/org/aion/base/util/MAF.java
@@ -1,27 +1,4 @@
 
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.util;
 
 import java.util.ArrayDeque;
diff --git a/modAionBase/src/org/aion/base/util/MAFast.java b/modAionBase/src/org/aion/base/util/MAFast.java
index ae2e2a8add..3c11566f4f 100644
--- a/modAionBase/src/org/aion/base/util/MAFast.java
+++ b/modAionBase/src/org/aion/base/util/MAFast.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.util;
 
 /**
diff --git a/modAionBase/src/org/aion/base/util/NativeLoader.java b/modAionBase/src/org/aion/base/util/NativeLoader.java
index 9e52bf5683..3e00ed14b4 100644
--- a/modAionBase/src/org/aion/base/util/NativeLoader.java
+++ b/modAionBase/src/org/aion/base/util/NativeLoader.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.io.File;
@@ -48,7 +13,9 @@
  * Native library loader.
  *
  * @author jin
+ * @apiNote This functionality is migrated to modUtil. Use that class instead.
  */
+@Deprecated
 public class NativeLoader {
 
     /**
diff --git a/modAionBase/src/org/aion/base/util/TimeInstant.java b/modAionBase/src/org/aion/base/util/TimeInstant.java
index f33014a81a..f1b63fdd5a 100644
--- a/modAionBase/src/org/aion/base/util/TimeInstant.java
+++ b/modAionBase/src/org/aion/base/util/TimeInstant.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.time.Instant;
diff --git a/modAionBase/src/org/aion/base/util/TimeUtils.java b/modAionBase/src/org/aion/base/util/TimeUtils.java
index 8c3c7f8262..cbfa2bc6b2 100644
--- a/modAionBase/src/org/aion/base/util/TimeUtils.java
+++ b/modAionBase/src/org/aion/base/util/TimeUtils.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 public class TimeUtils {
diff --git a/modAionBase/src/org/aion/base/util/TypeConverter.java b/modAionBase/src/org/aion/base/util/TypeConverter.java
index fb60f2c1f9..16e0483023 100644
--- a/modAionBase/src/org/aion/base/util/TypeConverter.java
+++ b/modAionBase/src/org/aion/base/util/TypeConverter.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.math.BigInteger;
diff --git a/modAionBase/src/org/aion/base/util/Utils.java b/modAionBase/src/org/aion/base/util/Utils.java
index b19cdacba0..81cce12e01 100644
--- a/modAionBase/src/org/aion/base/util/Utils.java
+++ b/modAionBase/src/org/aion/base/util/Utils.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 // import java.lang.reflect.Array;
diff --git a/modAionBase/src/org/aion/base/vm/IDataWord.java b/modAionBase/src/org/aion/base/vm/IDataWord.java
index 99fc1c8627..fb4021b7f3 100644
--- a/modAionBase/src/org/aion/base/vm/IDataWord.java
+++ b/modAionBase/src/org/aion/base/vm/IDataWord.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.vm;
 
 /** @author jay */
diff --git a/modAionBase/test/org/aion/base/type/AddressTest.java b/modAionBase/test/org/aion/base/type/AddressTest.java
index e081886cdd..7101312aff 100644
--- a/modAionBase/test/org/aion/base/type/AddressTest.java
+++ b/modAionBase/test/org/aion/base/type/AddressTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.type;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionBase/test/org/aion/base/type/Hash256Test.java b/modAionBase/test/org/aion/base/type/Hash256Test.java
index 187f5447ec..d4acf2d494 100644
--- a/modAionBase/test/org/aion/base/type/Hash256Test.java
+++ b/modAionBase/test/org/aion/base/type/Hash256Test.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.type;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionBase/test/org/aion/base/util/AddressValidationTest.java b/modAionBase/test/org/aion/base/util/AddressValidationTest.java
index 1a5e5fca20..601d6ff532 100644
--- a/modAionBase/test/org/aion/base/util/AddressValidationTest.java
+++ b/modAionBase/test/org/aion/base/util/AddressValidationTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.util;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionBase/test/org/aion/base/util/BIUtilTest.java b/modAionBase/test/org/aion/base/util/BIUtilTest.java
index d6bf8d20b1..b2628dd668 100644
--- a/modAionBase/test/org/aion/base/util/BIUtilTest.java
+++ b/modAionBase/test/org/aion/base/util/BIUtilTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.util;
 
 import static org.aion.base.util.BIUtil.isCovers;
diff --git a/modAionBase/test/org/aion/base/util/ByteArrayWrapperTest.java b/modAionBase/test/org/aion/base/util/ByteArrayWrapperTest.java
index 00f0a333db..6c0c108247 100644
--- a/modAionBase/test/org/aion/base/util/ByteArrayWrapperTest.java
+++ b/modAionBase/test/org/aion/base/util/ByteArrayWrapperTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import static org.aion.base.util.ByteUtil.hexStringToBytes;
diff --git a/modAionBase/test/org/aion/base/util/ByteUtilTest.java b/modAionBase/test/org/aion/base/util/ByteUtilTest.java
index 27d951c519..849a63d422 100644
--- a/modAionBase/test/org/aion/base/util/ByteUtilTest.java
+++ b/modAionBase/test/org/aion/base/util/ByteUtilTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.util;
 
 import static org.aion.base.util.ByteUtil.and;
diff --git a/modAionBase/test/org/aion/base/util/MAFTest.java b/modAionBase/test/org/aion/base/util/MAFTest.java
index 6e07565fb5..75c84632e1 100644
--- a/modAionBase/test/org/aion/base/util/MAFTest.java
+++ b/modAionBase/test/org/aion/base/util/MAFTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.base.util;
 
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/modAionBase/test/org/aion/base/util/SizeParseTest.java b/modAionBase/test/org/aion/base/util/SizeParseTest.java
index 4bf85f99f6..680ddebb6d 100644
--- a/modAionBase/test/org/aion/base/util/SizeParseTest.java
+++ b/modAionBase/test/org/aion/base/util/SizeParseTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.base.util;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/src/org/aion/equihash/EquiUtils.java b/modAionImpl/src/org/aion/equihash/EquiUtils.java
index 4f7b0de790..170c5de2b5 100644
--- a/modAionImpl/src/org/aion/equihash/EquiUtils.java
+++ b/modAionImpl/src/org/aion/equihash/EquiUtils.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import static org.aion.base.util.ByteUtil.bytesToInts;
diff --git a/modAionImpl/src/org/aion/equihash/EquiValidator.java b/modAionImpl/src/org/aion/equihash/EquiValidator.java
index eadedfd4f1..25df6e8bf7 100644
--- a/modAionImpl/src/org/aion/equihash/EquiValidator.java
+++ b/modAionImpl/src/org/aion/equihash/EquiValidator.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import static org.aion.base.util.ByteUtil.bytesToInts;
diff --git a/modAionImpl/src/org/aion/equihash/Equihash.java b/modAionImpl/src/org/aion/equihash/Equihash.java
index fe305a9746..f6014a7dcc 100644
--- a/modAionImpl/src/org/aion/equihash/Equihash.java
+++ b/modAionImpl/src/org/aion/equihash/Equihash.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import static org.aion.base.util.ByteUtil.merge;
diff --git a/modAionImpl/src/org/aion/equihash/EquihashMiner.java b/modAionImpl/src/org/aion/equihash/EquihashMiner.java
index 44cd27b27d..dd17f65507 100644
--- a/modAionImpl/src/org/aion/equihash/EquihashMiner.java
+++ b/modAionImpl/src/org/aion/equihash/EquihashMiner.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import static org.aion.base.util.Hex.toHexString;
diff --git a/modAionImpl/src/org/aion/equihash/FullStepRow.java b/modAionImpl/src/org/aion/equihash/FullStepRow.java
index e027822d76..2048151603 100644
--- a/modAionImpl/src/org/aion/equihash/FullStepRow.java
+++ b/modAionImpl/src/org/aion/equihash/FullStepRow.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import static org.aion.base.util.ByteUtil.intToBytes;
diff --git a/modAionImpl/src/org/aion/equihash/OptimizedEquiValidator.java b/modAionImpl/src/org/aion/equihash/OptimizedEquiValidator.java
index 6a45f77a04..bcfe85f47f 100644
--- a/modAionImpl/src/org/aion/equihash/OptimizedEquiValidator.java
+++ b/modAionImpl/src/org/aion/equihash/OptimizedEquiValidator.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import static org.aion.base.util.ByteUtil.intToBytesLE;
diff --git a/modAionImpl/src/org/aion/equihash/Solution.java b/modAionImpl/src/org/aion/equihash/Solution.java
index 10b73b502f..60e0574a3a 100644
--- a/modAionImpl/src/org/aion/equihash/Solution.java
+++ b/modAionImpl/src/org/aion/equihash/Solution.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 import org.aion.base.type.ISolution;
diff --git a/modAionImpl/src/org/aion/equihash/StepRow.java b/modAionImpl/src/org/aion/equihash/StepRow.java
index 5bb96c4fe4..3783a1463f 100644
--- a/modAionImpl/src/org/aion/equihash/StepRow.java
+++ b/modAionImpl/src/org/aion/equihash/StepRow.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.equihash;
 
 class StepRow {
diff --git a/modAionImpl/src/org/aion/net/Peer.java b/modAionImpl/src/org/aion/net/Peer.java
index d3871a63e5..56dde2823a 100644
--- a/modAionImpl/src/org/aion/net/Peer.java
+++ b/modAionImpl/src/org/aion/net/Peer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.net;
 
 import java.util.LinkedHashSet;
diff --git a/modAionImpl/src/org/aion/net/PeerSet.java b/modAionImpl/src/org/aion/net/PeerSet.java
index 68524e7cfb..5cf2e1a204 100644
--- a/modAionImpl/src/org/aion/net/PeerSet.java
+++ b/modAionImpl/src/org/aion/net/PeerSet.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.net;
 
 /** Represents the application specific set of peers currently connected to this node */
diff --git a/modAionImpl/src/org/aion/utils/HeapDumper.java b/modAionImpl/src/org/aion/utils/HeapDumper.java
index 172e623e46..18965a78ae 100644
--- a/modAionImpl/src/org/aion/utils/HeapDumper.java
+++ b/modAionImpl/src/org/aion/utils/HeapDumper.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.utils;
 
 import com.sun.management.HotSpotDiagnosticMXBean;
diff --git a/modAionImpl/src/org/aion/utils/NativeLibrary.java b/modAionImpl/src/org/aion/utils/NativeLibrary.java
index 4ca37fac8e..1637831c95 100644
--- a/modAionImpl/src/org/aion/utils/NativeLibrary.java
+++ b/modAionImpl/src/org/aion/utils/NativeLibrary.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.utils;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/utils/TaskDumpHeap.java b/modAionImpl/src/org/aion/utils/TaskDumpHeap.java
index 443303cc11..cc7a12580a 100644
--- a/modAionImpl/src/org/aion/utils/TaskDumpHeap.java
+++ b/modAionImpl/src/org/aion/utils/TaskDumpHeap.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.utils;
 
 import java.io.File;
diff --git a/modAionImpl/src/org/aion/utils/TaskDumpThreadsAndBlocks.java b/modAionImpl/src/org/aion/utils/TaskDumpThreadsAndBlocks.java
index e0f1a0c191..cdd4684514 100644
--- a/modAionImpl/src/org/aion/utils/TaskDumpThreadsAndBlocks.java
+++ b/modAionImpl/src/org/aion/utils/TaskDumpThreadsAndBlocks.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.utils;
 
 import java.io.IOException;
diff --git a/modAionImpl/src/org/aion/utils/ThreadDumper.java b/modAionImpl/src/org/aion/utils/ThreadDumper.java
index b0ae7d29ce..88720e4cba 100644
--- a/modAionImpl/src/org/aion/utils/ThreadDumper.java
+++ b/modAionImpl/src/org/aion/utils/ThreadDumper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.utils;
 
 import java.lang.management.LockInfo;
diff --git a/modAionImpl/src/org/aion/zero/impl/A0BCConfig.java b/modAionImpl/src/org/aion/zero/impl/A0BCConfig.java
index 07f7444010..75c1a5fdac 100644
--- a/modAionImpl/src/org/aion/zero/impl/A0BCConfig.java
+++ b/modAionImpl/src/org/aion/zero/impl/A0BCConfig.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import org.aion.base.type.Address;
diff --git a/modAionImpl/src/org/aion/zero/impl/AionBlockLoader.java b/modAionImpl/src/org/aion/zero/impl/AionBlockLoader.java
index d047878f7c..f50b405a6c 100644
--- a/modAionImpl/src/org/aion/zero/impl/AionBlockLoader.java
+++ b/modAionImpl/src/org/aion/zero/impl/AionBlockLoader.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import java.text.DateFormat;
diff --git a/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java b/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
index 54ef1c80c2..34407005e5 100644
--- a/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
+++ b/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import static java.lang.Math.max;
diff --git a/modAionImpl/src/org/aion/zero/impl/AionGenesis.java b/modAionImpl/src/org/aion/zero/impl/AionGenesis.java
index 1187e3e8f9..654c757c87 100644
--- a/modAionImpl/src/org/aion/zero/impl/AionGenesis.java
+++ b/modAionImpl/src/org/aion/zero/impl/AionGenesis.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/AionHub.java b/modAionImpl/src/org/aion/zero/impl/AionHub.java
index b2796de5c0..7418ff04a7 100644
--- a/modAionImpl/src/org/aion/zero/impl/AionHub.java
+++ b/modAionImpl/src/org/aion/zero/impl/AionHub.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static org.aion.crypto.HashUtil.EMPTY_TRIE_HASH;
diff --git a/modAionImpl/src/org/aion/zero/impl/AionHubUtils.java b/modAionImpl/src/org/aion/zero/impl/AionHubUtils.java
index b8dc35c2f2..4f7dfbde49 100644
--- a/modAionImpl/src/org/aion/zero/impl/AionHubUtils.java
+++ b/modAionImpl/src/org/aion/zero/impl/AionHubUtils.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/BlockContext.java b/modAionImpl/src/org/aion/zero/impl/BlockContext.java
index 68a5cceabb..c6888c8979 100644
--- a/modAionImpl/src/org/aion/zero/impl/BlockContext.java
+++ b/modAionImpl/src/org/aion/zero/impl/BlockContext.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/GenesisBlockLoader.java b/modAionImpl/src/org/aion/zero/impl/GenesisBlockLoader.java
index 10f2dbf5b4..dddbe132fe 100644
--- a/modAionImpl/src/org/aion/zero/impl/GenesisBlockLoader.java
+++ b/modAionImpl/src/org/aion/zero/impl/GenesisBlockLoader.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import com.google.common.io.ByteStreams;
diff --git a/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java b/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java
index ece41c2bcd..c3b2bd0644 100644
--- a/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java
+++ b/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/Version.java b/modAionImpl/src/org/aion/zero/impl/Version.java
index 68ce7ff624..2a09c4f6a5 100644
--- a/modAionImpl/src/org/aion/zero/impl/Version.java
+++ b/modAionImpl/src/org/aion/zero/impl/Version.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 public class Version {
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionFactory.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionFactory.java
index c6830dd35b..420ff63a47 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/AionFactory.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/AionFactory.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.blockchain;
 
 import org.aion.log.AionLoggerFactory;
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionImpl.java
index 2ab0601226..e48da830a1 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/AionImpl.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/AionImpl.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
index 6dbe7a0275..2094e93ebc 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/AionPendingStateImpl.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/ChainConfiguration.java b/modAionImpl/src/org/aion/zero/impl/blockchain/ChainConfiguration.java
index 656df70bfe..9468678865 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/ChainConfiguration.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/ChainConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/IAionChain.java b/modAionImpl/src/org/aion/zero/impl/blockchain/IAionChain.java
index f865c06f8d..4e43cfba7a 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/IAionChain.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/IAionChain.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java b/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java
index f28fe1b515..13924503cd 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/PendingTxCache.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/PoolDumpUtils.java b/modAionImpl/src/org/aion/zero/impl/blockchain/PoolDumpUtils.java
index c477a734bd..4ded39ed08 100644
--- a/modAionImpl/src/org/aion/zero/impl/blockchain/PoolDumpUtils.java
+++ b/modAionImpl/src/org/aion/zero/impl/blockchain/PoolDumpUtils.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import org.aion.zero.impl.AionHub;
diff --git a/modAionImpl/src/org/aion/zero/impl/cli/Arguments.java b/modAionImpl/src/org/aion/zero/impl/cli/Arguments.java
index 1191167604..aadd963a53 100644
--- a/modAionImpl/src/org/aion/zero/impl/cli/Arguments.java
+++ b/modAionImpl/src/org/aion/zero/impl/cli/Arguments.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.cli;
 
 import java.util.ArrayList;
@@ -126,6 +103,11 @@ public class Arguments {
             description = "execute kernel with selected database directory")
     private String directory = null;
 
+    @Option(
+            names = {"-p", "--port"},
+            description = "execute kernel with selected port")
+    private String port = null;
+
     // offline database query and update
     @Option(
             names = {"ps", "--state"},
@@ -240,6 +222,10 @@ public String getDirectory() {
         return directory;
     }
 
+    public String getPort() {
+        return port;
+    }
+
     public String getPruneStateOption() {
         return pruntStateOption;
     }
diff --git a/modAionImpl/src/org/aion/zero/impl/cli/Cli.java b/modAionImpl/src/org/aion/zero/impl/cli/Cli.java
index 2d7d36d4bb..f066b84271 100644
--- a/modAionImpl/src/org/aion/zero/impl/cli/Cli.java
+++ b/modAionImpl/src/org/aion/zero/impl/cli/Cli.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.cli;
 
 import static org.aion.zero.impl.cli.Cli.ReturnType.ERROR;
@@ -191,7 +168,37 @@ public ReturnType call(final String[] args, Cfg cfg) {
             // true means the UUID must be set
             boolean overwrite = cfg.fromXML(configFile);
 
-            // 4. can be influenced by the -d argument above
+            // determine the port configuration, can be combined with the -n, -d, -c, -i arguments
+            if (options.getPort() != null) {
+
+                int currentPort = cfg.getNet().getP2p().getPort();
+                int portNumber = currentPort;
+                boolean validPort = true;
+
+                try {
+                    portNumber = Integer.parseInt(options.getPort());
+                } catch (NumberFormatException e) {
+                    validPort = false;
+                    System.out.println("Port must be an integer value");
+                }
+
+                if (portNumber < 0 || portNumber > 0xFFFF) {
+                    validPort = false;
+                    System.out.println("Port out of range: " + portNumber);
+                }
+
+                if (validPort && portNumber != currentPort) {
+                    // update port in config
+                    cfg.getNet().getP2p().setPort(portNumber);
+                    overwrite = true;
+                    System.out.println("Port set to: " + portNumber);
+                } else {
+                    System.out.println("Using the current port configuration: " + currentPort);
+                }
+                // no return, allow for other parameters combined with -p
+            }
+
+            // 4. can be influenced by the -n, -d, -p arguments above
 
             if (options.getConfig() != null) {
                 // network was already set above
@@ -229,15 +236,15 @@ public ReturnType call(final String[] args, Cfg cfg) {
                 return ReturnType.EXIT;
             }
 
-            // 5. options that can be influenced by the -d and -n arguments
+            // 5. options that can be influenced by the -d, -n and -p arguments
 
             if (options.isInfo()) {
                 System.out.println(
                         "Reading config file from: "
                                 + getRelativePath(configFile.getAbsolutePath()));
                 if (overwrite) {
-                    // updating the file in case the user id was not set
-                    cfg.toXML(new String[] {"--id=" + cfg.getId()}, configFile);
+                    // updating the file in case the user id was not set; overwrite port
+                    cfg.toXML(null, configFile);
                 }
                 printInfo(cfg);
                 return ReturnType.EXIT;
@@ -247,8 +254,8 @@ public ReturnType call(final String[] args, Cfg cfg) {
             makeDirs(configFile, forkFile, cfg);
 
             if (overwrite) {
-                // only updating the file in case the user id was not set
-                cfg.toXML(new String[] {"--id=" + cfg.getId()}, cfg.getExecConfigFile());
+                // updating the file in case the user id was not set; overwrite port
+                cfg.toXML(null, cfg.getExecConfigFile());
             }
 
             // set correct keystore directory
@@ -861,6 +868,9 @@ Set<String> getSkippedTasks(Arguments options, TaskPriority breakingTaskPriority
             if (options.getDirectory() != null) {
                 skippedTasks.add("--datadir");
             }
+            if (options.getPort() != null) {
+                skippedTasks.add("--port");
+            }
             if (options.getConfig() != null) {
                 skippedTasks.add("--config");
             }
diff --git a/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java b/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java
index 0b07d5223b..c491f63dac 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/CfgAion.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config;
 
 import com.google.common.base.Objects;
@@ -345,7 +322,9 @@ public void toXML(final String[] args, File file) {
                     if (subArgsArr.length > 0) {
                         List<String> _nodes = new ArrayList<>();
                         for (String subArg : subArgsArr) {
-                            if (!subArg.equals("")) _nodes.add(subArg);
+                            if (!subArg.equals("")) {
+                                _nodes.add(subArg);
+                            }
                         }
                         this.getNet().setNodes(_nodes.toArray(new String[0]));
                     }
@@ -354,7 +333,9 @@ public void toXML(final String[] args, File file) {
                     override = true;
                     String[] subArgsArr = arg.replace("--p2p=", "").split(",");
                     if (subArgsArr.length == 2) {
-                        this.getNet().getP2p().setIp(subArgsArr[0]);
+                        if (!subArgsArr[0].equals("")) {
+                            this.getNet().getP2p().setIp(subArgsArr[0]);
+                        }
                         this.getNet().getP2p().setPort(Integer.parseInt(subArgsArr[1]));
                     }
                 }
diff --git a/modAionImpl/src/org/aion/zero/impl/config/CfgConsensusPow.java b/modAionImpl/src/org/aion/zero/impl/config/CfgConsensusPow.java
index a7d9ae7120..33231e92e6 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/CfgConsensusPow.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/CfgConsensusPow.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config;
 
 import java.io.IOException;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/CfgEnergyStrategy.java b/modAionImpl/src/org/aion/zero/impl/config/CfgEnergyStrategy.java
index 7cafe21d46..ab931d5844 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/CfgEnergyStrategy.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/CfgEnergyStrategy.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config;
 
 import static org.aion.zero.impl.core.energy.EnergyStrategies.CLAMPED_DECAYING;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/Network.java b/modAionImpl/src/org/aion/zero/impl/config/Network.java
index 004f57d1a8..0699cfb0ca 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/Network.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/Network.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config;
 
 import java.util.Arrays;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/ConfigProposalResult.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/ConfigProposalResult.java
index 04090fcf5a..d3b9495c40 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/ConfigProposalResult.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/ConfigProposalResult.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 import java.io.Serializable;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistry.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistry.java
index e648a6e1d2..319a6f6757 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistry.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistry.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/IDynamicConfigApplier.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/IDynamicConfigApplier.java
index 0f73f23cdd..d82594d1d8 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/IDynamicConfigApplier.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/IDynamicConfigApplier.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 import org.aion.mcf.config.Cfg;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeException.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeException.java
index 4a26132de4..2076f81242 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeException.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeException.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 public class InFlightConfigChangeException extends Exception {
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeNotAllowedException.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeNotAllowedException.java
index 1a25d838e6..8148ed3d08 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeNotAllowedException.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeNotAllowedException.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 public class InFlightConfigChangeNotAllowedException extends InFlightConfigChangeException {
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeResult.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeResult.java
index 0a8bdf3683..c11d85e7f7 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeResult.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigChangeResult.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 public class InFlightConfigChangeResult {
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiver.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiver.java
index e6fade3408..4140457b06 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiver.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiver.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverMBean.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverMBean.java
index 002121a7b2..dde8abca0f 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverMBean.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverMBean.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 import javax.xml.stream.XMLStreamReader;
diff --git a/modAionImpl/src/org/aion/zero/impl/config/dynamic/RollbackException.java b/modAionImpl/src/org/aion/zero/impl/config/dynamic/RollbackException.java
index 32816ca4b2..46c18cbc97 100644
--- a/modAionImpl/src/org/aion/zero/impl/config/dynamic/RollbackException.java
+++ b/modAionImpl/src/org/aion/zero/impl/config/dynamic/RollbackException.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.config.dynamic;
 
 import java.util.LinkedList;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/BloomFilter.java b/modAionImpl/src/org/aion/zero/impl/core/BloomFilter.java
index da6e458793..726ad72995 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/BloomFilter.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/BloomFilter.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core;
 
 import org.aion.base.type.Address;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/DiffCalc.java b/modAionImpl/src/org/aion/zero/impl/core/DiffCalc.java
index fb66cbd1aa..8fcdafa2f4 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/DiffCalc.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/DiffCalc.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core;
 
 import static org.aion.base.util.BIUtil.max;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/IAionBlockchain.java b/modAionImpl/src/org/aion/zero/impl/core/IAionBlockchain.java
index 423939a3ca..bf1568b8ed 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/IAionBlockchain.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/IAionBlockchain.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/RewardsCalculator.java b/modAionImpl/src/org/aion/zero/impl/core/RewardsCalculator.java
index ceffcb759a..e425310e81 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/RewardsCalculator.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/RewardsCalculator.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/energy/AbstractEnergyStrategyLimit.java b/modAionImpl/src/org/aion/zero/impl/core/energy/AbstractEnergyStrategyLimit.java
index 66172edb2f..6658caf421 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/energy/AbstractEnergyStrategyLimit.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/energy/AbstractEnergyStrategyLimit.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import org.aion.zero.types.A0BlockHeader;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/energy/ClampedDecayStrategy.java b/modAionImpl/src/org/aion/zero/impl/core/energy/ClampedDecayStrategy.java
index 92cb9f346f..3cd724c9bd 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/energy/ClampedDecayStrategy.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/energy/ClampedDecayStrategy.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import org.aion.zero.types.A0BlockHeader;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/energy/DecayStrategy.java b/modAionImpl/src/org/aion/zero/impl/core/energy/DecayStrategy.java
index 433b204664..65a570695c 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/energy/DecayStrategy.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/energy/DecayStrategy.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import org.aion.zero.types.A0BlockHeader;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/energy/EnergyStrategies.java b/modAionImpl/src/org/aion/zero/impl/core/energy/EnergyStrategies.java
index 4126b93d5b..6a48d390e6 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/energy/EnergyStrategies.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/energy/EnergyStrategies.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import java.util.HashMap;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/energy/MonotonicallyIncreasingStrategy.java b/modAionImpl/src/org/aion/zero/impl/core/energy/MonotonicallyIncreasingStrategy.java
index 26745bf8b8..756b4f4270 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/energy/MonotonicallyIncreasingStrategy.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/energy/MonotonicallyIncreasingStrategy.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import org.aion.zero.types.A0BlockHeader;
diff --git a/modAionImpl/src/org/aion/zero/impl/core/energy/TargetStrategy.java b/modAionImpl/src/org/aion/zero/impl/core/energy/TargetStrategy.java
index c5cfd967fc..25f4c48edd 100644
--- a/modAionImpl/src/org/aion/zero/impl/core/energy/TargetStrategy.java
+++ b/modAionImpl/src/org/aion/zero/impl/core/energy/TargetStrategy.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import org.aion.zero.types.A0BlockHeader;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java b/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java
index 9709ec5b5b..97208327ad 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/AionBlockStore.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.db;
 
 import static java.math.BigInteger.ZERO;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryDummy.java b/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryDummy.java
index 49d9a3b7f4..4cfa6a7d98 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryDummy.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryDummy.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import static org.aion.crypto.HashUtil.h256;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java b/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java
index 317c8c3398..fd654b15fb 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryImpl.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionTransactionStoreSerializer.java b/modAionImpl/src/org/aion/zero/impl/db/AionTransactionStoreSerializer.java
index cae4af288e..36e6cff543 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/AionTransactionStoreSerializer.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/AionTransactionStoreSerializer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/ContractDetailsAion.java b/modAionImpl/src/org/aion/zero/impl/db/ContractDetailsAion.java
index 184d85be82..2c18de65b9 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/ContractDetailsAion.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/ContractDetailsAion.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import org.aion.base.db.DetailsProvider;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/PendingBlockStore.java b/modAionImpl/src/org/aion/zero/impl/db/PendingBlockStore.java
index 932309497a..fec3490088 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/PendingBlockStore.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/PendingBlockStore.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import static org.aion.mcf.db.DatabaseUtils.connectAndOpen;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/RecoveryUtils.java b/modAionImpl/src/org/aion/zero/impl/db/RecoveryUtils.java
index 2ca5f68685..79947967c9 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/RecoveryUtils.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/RecoveryUtils.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import java.io.IOException;
diff --git a/modAionImpl/src/org/aion/zero/impl/db/RepositoryConfig.java b/modAionImpl/src/org/aion/zero/impl/db/RepositoryConfig.java
index 697dc832e1..a5190df066 100644
--- a/modAionImpl/src/org/aion/zero/impl/db/RepositoryConfig.java
+++ b/modAionImpl/src/org/aion/zero/impl/db/RepositoryConfig.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import java.util.Map;
diff --git a/modAionImpl/src/org/aion/zero/impl/pow/AionPoW.java b/modAionImpl/src/org/aion/zero/impl/pow/AionPoW.java
index f6c03c4095..af90496b18 100644
--- a/modAionImpl/src/org/aion/zero/impl/pow/AionPoW.java
+++ b/modAionImpl/src/org/aion/zero/impl/pow/AionPoW.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.pow;
 
 import static org.aion.mcf.core.ImportResult.IMPORTED_BEST;
diff --git a/modAionImpl/src/org/aion/zero/impl/query/BlockQueryInterface.java b/modAionImpl/src/org/aion/zero/impl/query/BlockQueryInterface.java
index 8c87336aa4..64c2b2a522 100644
--- a/modAionImpl/src/org/aion/zero/impl/query/BlockQueryInterface.java
+++ b/modAionImpl/src/org/aion/zero/impl/query/BlockQueryInterface.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.query;
 
 import java.util.Optional;
diff --git a/modAionImpl/src/org/aion/zero/impl/query/QueryInterface.java b/modAionImpl/src/org/aion/zero/impl/query/QueryInterface.java
index 7e7348a502..5ae379d481 100644
--- a/modAionImpl/src/org/aion/zero/impl/query/QueryInterface.java
+++ b/modAionImpl/src/org/aion/zero/impl/query/QueryInterface.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.query;
 
 public interface QueryInterface
diff --git a/modAionImpl/src/org/aion/zero/impl/query/StateQueryInterface.java b/modAionImpl/src/org/aion/zero/impl/query/StateQueryInterface.java
index 5e3da2411c..1507f43c48 100644
--- a/modAionImpl/src/org/aion/zero/impl/query/StateQueryInterface.java
+++ b/modAionImpl/src/org/aion/zero/impl/query/StateQueryInterface.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.query;
 
 import java.util.Optional;
diff --git a/modAionImpl/src/org/aion/zero/impl/query/SyncQueryInterface.java b/modAionImpl/src/org/aion/zero/impl/query/SyncQueryInterface.java
index 3cef70008f..ae4d966375 100644
--- a/modAionImpl/src/org/aion/zero/impl/query/SyncQueryInterface.java
+++ b/modAionImpl/src/org/aion/zero/impl/query/SyncQueryInterface.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.query;
 
 import java.util.Optional;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/Act.java b/modAionImpl/src/org/aion/zero/impl/sync/Act.java
index cf16eb1b28..3a1b69131c 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/Act.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/Act.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync;
 
 /** @author chris */
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/BlocksWrapper.java b/modAionImpl/src/org/aion/zero/impl/sync/BlocksWrapper.java
index 8fd67d04ac..615c463c9e 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/BlocksWrapper.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/BlocksWrapper.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/HeaderQuery.java b/modAionImpl/src/org/aion/zero/impl/sync/HeaderQuery.java
index ed2dd8f702..b65a41b941 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/HeaderQuery.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/HeaderQuery.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync;
 
 /** @author chris */
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/HeadersWrapper.java b/modAionImpl/src/org/aion/zero/impl/sync/HeadersWrapper.java
index c997622a7b..b991bd288e 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/HeadersWrapper.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/HeadersWrapper.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/NetworkStatus.java b/modAionImpl/src/org/aion/zero/impl/sync/NetworkStatus.java
index d48326f1ee..a3fa9e9bea 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/NetworkStatus.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/NetworkStatus.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/PeerState.java b/modAionImpl/src/org/aion/zero/impl/sync/PeerState.java
index e72579a067..7041f2765d 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/PeerState.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/PeerState.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import static org.aion.p2p.P2pConstant.STEP_COUNT;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/RequestCounter.java b/modAionImpl/src/org/aion/zero/impl/sync/RequestCounter.java
index 9d9eb76a3e..b1d7e95439 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/RequestCounter.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/RequestCounter.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 /**
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/RequestType.java b/modAionImpl/src/org/aion/zero/impl/sync/RequestType.java
index 1ecc8f04c2..56da4cb6d6 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/RequestType.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/RequestType.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 /**
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/SyncAid.java b/modAionImpl/src/org/aion/zero/impl/sync/SyncAid.java
index d462a2f5e0..5a8906cdb8 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/SyncAid.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/SyncAid.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/SyncMgr.java b/modAionImpl/src/org/aion/zero/impl/sync/SyncMgr.java
index 86e424703e..bc134b1b9b 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/SyncMgr.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/SyncMgr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.sync;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/SyncStats.java b/modAionImpl/src/org/aion/zero/impl/sync/SyncStats.java
index 0eb8706558..c0b3dba823 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/SyncStats.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/SyncStats.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.Collections;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskDropImportedBlocks.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskDropImportedBlocks.java
index 6e2eb8dccc..daf9780b22 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskDropImportedBlocks.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskDropImportedBlocks.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.Arrays;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskGetBodies.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskGetBodies.java
index 964746fed0..1f026e218c 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskGetBodies.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskGetBodies.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskGetHeaders.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskGetHeaders.java
index dfd5248ac1..6d023f35b1 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskGetHeaders.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskGetHeaders.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import static org.aion.p2p.P2pConstant.BACKWARD_SYNC_STEP;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskGetStatus.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskGetStatus.java
index acc52840b9..780a01a325 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskGetStatus.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskGetStatus.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
index f76fcb88da..d8473b2919 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.sync;
 
 import static org.aion.p2p.P2pConstant.COEFFICIENT_NORMAL_PEERS;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskShowStatus.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskShowStatus.java
index 39fcda7bef..1df39d6f6e 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskShowStatus.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskShowStatus.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskStorePendingBlocks.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskStorePendingBlocks.java
index 6bd717bf28..c14e15913e 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskStorePendingBlocks.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskStorePendingBlocks.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/BlockPropagationHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/BlockPropagationHandler.java
index 36ffd7f440..4e015d0f05 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/BlockPropagationHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/BlockPropagationHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastNewBlockHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastNewBlockHandler.java
index 968dcbe689..58a3fbb780 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastNewBlockHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastNewBlockHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import org.aion.base.util.ByteUtil;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastTxHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastTxHandler.java
index 1b83d0b97d..afdc1be5ad 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastTxHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/BroadcastTxHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksBodiesHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksBodiesHandler.java
index a795367d12..177599af57 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksBodiesHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksBodiesHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksHeadersHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksHeadersHandler.java
index e11bdb02ef..bd6689c79a 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksHeadersHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqBlocksHeadersHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqStatusHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqStatusHandler.java
index fabf312428..72516e572b 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqStatusHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/ReqStatusHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import org.aion.p2p.Ctrl;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksBodiesHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksBodiesHandler.java
index 86a432181b..664b7255bd 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksBodiesHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksBodiesHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksHeadersHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksHeadersHandler.java
index aa25c315ce..60ad630a4c 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksHeadersHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/ResBlocksHeadersHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/handler/ResStatusHandler.java b/modAionImpl/src/org/aion/zero/impl/sync/handler/ResStatusHandler.java
index d7dbf6062d..ffaad0263e 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/handler/ResStatusHandler.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/handler/ResStatusHandler.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.handler;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastNewBlock.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastNewBlock.java
index 9410e608b8..ca97001026 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastNewBlock.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastNewBlock.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import org.aion.base.type.IBlock;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastTx.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastTx.java
index cc99fb64cf..48a04f68e8 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastTx.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/BroadcastTx.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksBodies.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksBodies.java
index 7b2bf4205d..1edd52a497 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksBodies.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksBodies.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.sync.msg;
 
 import java.nio.ByteBuffer;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksHeaders.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksHeaders.java
index f6a6d8e13b..f074c841fa 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksHeaders.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqBlocksHeaders.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import java.nio.ByteBuffer;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqStatus.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqStatus.java
index be7771757d..4564cc2efa 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqStatus.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/ReqStatus.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import org.aion.p2p.Ctrl;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksBodies.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksBodies.java
index 14f717b41e..6329ba49c8 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksBodies.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksBodies.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksHeaders.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksHeaders.java
index cfed7b04e8..9e99b6ef1e 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksHeaders.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/ResBlocksHeaders.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/sync/msg/ResStatus.java b/modAionImpl/src/org/aion/zero/impl/sync/msg/ResStatus.java
index 581714fdbb..22bac6f53b 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/msg/ResStatus.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/msg/ResStatus.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import java.nio.ByteBuffer;
diff --git a/modAionImpl/src/org/aion/zero/impl/tx/A0TxTask.java b/modAionImpl/src/org/aion/zero/impl/tx/A0TxTask.java
index afcbeae194..9ff9b7cc84 100644
--- a/modAionImpl/src/org/aion/zero/impl/tx/A0TxTask.java
+++ b/modAionImpl/src/org/aion/zero/impl/tx/A0TxTask.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.tx;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/tx/TxBroadcaster.java b/modAionImpl/src/org/aion/zero/impl/tx/TxBroadcaster.java
index a1d4d1e791..9371425481 100644
--- a/modAionImpl/src/org/aion/zero/impl/tx/TxBroadcaster.java
+++ b/modAionImpl/src/org/aion/zero/impl/tx/TxBroadcaster.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.tx;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/tx/TxCollector.java b/modAionImpl/src/org/aion/zero/impl/tx/TxCollector.java
index 1c08d60519..60d7d78b9b 100644
--- a/modAionImpl/src/org/aion/zero/impl/tx/TxCollector.java
+++ b/modAionImpl/src/org/aion/zero/impl/tx/TxCollector.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.tx;
 
 import java.util.ArrayList;
diff --git a/modAionImpl/src/org/aion/zero/impl/types/AionBlkWrapper.java b/modAionImpl/src/org/aion/zero/impl/types/AionBlkWrapper.java
index 975f72f554..8cae0a6945 100644
--- a/modAionImpl/src/org/aion/zero/impl/types/AionBlkWrapper.java
+++ b/modAionImpl/src/org/aion/zero/impl/types/AionBlkWrapper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.types;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/types/AionBlock.java b/modAionImpl/src/org/aion/zero/impl/types/AionBlock.java
index 3d22cf3f44..0e5f60942c 100644
--- a/modAionImpl/src/org/aion/zero/impl/types/AionBlock.java
+++ b/modAionImpl/src/org/aion/zero/impl/types/AionBlock.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.types;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/types/AionBlockHeaderWrapper.java b/modAionImpl/src/org/aion/zero/impl/types/AionBlockHeaderWrapper.java
index 2143a9af09..7948c8e3c8 100644
--- a/modAionImpl/src/org/aion/zero/impl/types/AionBlockHeaderWrapper.java
+++ b/modAionImpl/src/org/aion/zero/impl/types/AionBlockHeaderWrapper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.types;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/types/AionBlockSummary.java b/modAionImpl/src/org/aion/zero/impl/types/AionBlockSummary.java
index a28d662f9f..42fc727273 100644
--- a/modAionImpl/src/org/aion/zero/impl/types/AionBlockSummary.java
+++ b/modAionImpl/src/org/aion/zero/impl/types/AionBlockSummary.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.types;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/types/AionTxInfo.java b/modAionImpl/src/org/aion/zero/impl/types/AionTxInfo.java
index d8a166faa8..b0a15e46cd 100644
--- a/modAionImpl/src/org/aion/zero/impl/types/AionTxInfo.java
+++ b/modAionImpl/src/org/aion/zero/impl/types/AionTxInfo.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.types;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/types/RetValidPreBlock.java b/modAionImpl/src/org/aion/zero/impl/types/RetValidPreBlock.java
index 97d7d44f9c..6fc7030b67 100644
--- a/modAionImpl/src/org/aion/zero/impl/types/RetValidPreBlock.java
+++ b/modAionImpl/src/org/aion/zero/impl/types/RetValidPreBlock.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.types;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/AionDifficultyRule.java b/modAionImpl/src/org/aion/zero/impl/valid/AionDifficultyRule.java
index 12b473e08c..ea279dbc3e 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/AionDifficultyRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/AionDifficultyRule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.valid;
 
 import static org.aion.base.util.BIUtil.isEqual;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/AionExtraDataRule.java b/modAionImpl/src/org/aion/zero/impl/valid/AionExtraDataRule.java
index bf71e9d60a..5b6d34bdbb 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/AionExtraDataRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/AionExtraDataRule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.valid;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/AionHeaderVersionRule.java b/modAionImpl/src/org/aion/zero/impl/valid/AionHeaderVersionRule.java
index 99d77dc717..171689eff4 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/AionHeaderVersionRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/AionHeaderVersionRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.valid;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/AionPOWRule.java b/modAionImpl/src/org/aion/zero/impl/valid/AionPOWRule.java
index 6901b3beb7..a840805199 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/AionPOWRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/AionPOWRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.valid;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/EnergyConsumedRule.java b/modAionImpl/src/org/aion/zero/impl/valid/EnergyConsumedRule.java
index 1d1a5e08d1..61d3248031 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/EnergyConsumedRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/EnergyConsumedRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.valid;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/EnergyLimitRule.java b/modAionImpl/src/org/aion/zero/impl/valid/EnergyLimitRule.java
index 422966d529..2909f6872d 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/EnergyLimitRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/EnergyLimitRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.valid;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/EquihashSolutionRule.java b/modAionImpl/src/org/aion/zero/impl/valid/EquihashSolutionRule.java
index f0c0838a0e..e593b21599 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/EquihashSolutionRule.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/EquihashSolutionRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.valid;
 
 import java.util.List;
diff --git a/modAionImpl/src/org/aion/zero/impl/valid/TXValidator.java b/modAionImpl/src/org/aion/zero/impl/valid/TXValidator.java
index 26be89be2d..9b5ab4b5cb 100644
--- a/modAionImpl/src/org/aion/zero/impl/valid/TXValidator.java
+++ b/modAionImpl/src/org/aion/zero/impl/valid/TXValidator.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.valid;
 
 import static org.aion.mcf.valid.TxNrgRule.isValidNrgContractCreate;
diff --git a/modAionImpl/src/org/aion/zero/impl/vm/AionExecutorProvider.java b/modAionImpl/src/org/aion/zero/impl/vm/AionExecutorProvider.java
index 1a5ea5fb44..7ca5168e3b 100644
--- a/modAionImpl/src/org/aion/zero/impl/vm/AionExecutorProvider.java
+++ b/modAionImpl/src/org/aion/zero/impl/vm/AionExecutorProvider.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.vm;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modAionImpl/test/org/aion/db/AionContractDetailsTest.java b/modAionImpl/test/org/aion/db/AionContractDetailsTest.java
index 146f9835e6..21db8915f8 100644
--- a/modAionImpl/test/org/aion/db/AionContractDetailsTest.java
+++ b/modAionImpl/test/org/aion/db/AionContractDetailsTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.db;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionImpl/test/org/aion/db/DoubleDataWordTest.java b/modAionImpl/test/org/aion/db/DoubleDataWordTest.java
index 760d9dcf12..4d3f212f7b 100644
--- a/modAionImpl/test/org/aion/db/DoubleDataWordTest.java
+++ b/modAionImpl/test/org/aion/db/DoubleDataWordTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modAionImpl/test/org/aion/equihash/EquihashConversionTest210_9.java b/modAionImpl/test/org/aion/equihash/EquihashConversionTest210_9.java
index 6619281d87..84566aeae0 100644
--- a/modAionImpl/test/org/aion/equihash/EquihashConversionTest210_9.java
+++ b/modAionImpl/test/org/aion/equihash/EquihashConversionTest210_9.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.equihash;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modAionImpl/test/org/aion/equihash/EquihashSolutionsGenerationTest210_9.java b/modAionImpl/test/org/aion/equihash/EquihashSolutionsGenerationTest210_9.java
index d764f6f4d0..d63b9bb827 100644
--- a/modAionImpl/test/org/aion/equihash/EquihashSolutionsGenerationTest210_9.java
+++ b/modAionImpl/test/org/aion/equihash/EquihashSolutionsGenerationTest210_9.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.equihash;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modAionImpl/test/org/aion/equihash/EquihashValidatorTest.java b/modAionImpl/test/org/aion/equihash/EquihashValidatorTest.java
index 60b14dc7b6..e748bac3a5 100644
--- a/modAionImpl/test/org/aion/equihash/EquihashValidatorTest.java
+++ b/modAionImpl/test/org/aion/equihash/EquihashValidatorTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.equihash;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionImpl/test/org/aion/equihash/benchmark/BatchHeaderBenchmark.java b/modAionImpl/test/org/aion/equihash/benchmark/BatchHeaderBenchmark.java
index c214ef69c7..f8cf34bb47 100644
--- a/modAionImpl/test/org/aion/equihash/benchmark/BatchHeaderBenchmark.java
+++ b/modAionImpl/test/org/aion/equihash/benchmark/BatchHeaderBenchmark.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 // package org.aion.equihash.benchmark;
 //
 // import org.aion.base.type.Address;
diff --git a/modAionImpl/test/org/aion/util/TestResources.java b/modAionImpl/test/org/aion/util/TestResources.java
index f7a64d5000..baf93c035f 100644
--- a/modAionImpl/test/org/aion/util/TestResources.java
+++ b/modAionImpl/test/org/aion/util/TestResources.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.util;
 
 import java.io.BufferedReader;
diff --git a/modAionImpl/test/org/aion/zero/impl/AionHubTest.java b/modAionImpl/test/org/aion/zero/impl/AionHubTest.java
index bd2c296231..17d99693d4 100644
--- a/modAionImpl/test/org/aion/zero/impl/AionHubTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/AionHubTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateBenchmark.java b/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateBenchmark.java
index 17519e2a38..d0932b977e 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateBenchmark.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateBenchmark.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateTest.java
index a9c7bb4efd..a29d96df9a 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainAccountStateTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrencyTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrencyTest.java
index dd8c54a136..a87f023e83 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrencyTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrencyTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrentImportTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrentImportTest.java
index e617239610..32b03aa83b 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrentImportTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainConcurrentImportTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainDataRecoveryTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainDataRecoveryTest.java
index 131437bf17..a686dde19b 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainDataRecoveryTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainDataRecoveryTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainDifficultyTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainDifficultyTest.java
index c110872fb7..5c698452f1 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainDifficultyTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainDifficultyTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainEnergyTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainEnergyTest.java
index 266d5f0319..56934286c7 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainEnergyTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainEnergyTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainForkingTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainForkingTest.java
index cfba8e7326..6951051449 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainForkingTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainForkingTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainImplementationTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainImplementationTest.java
index 990ce05875..eaefd5bf81 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainImplementationTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainImplementationTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainIndexIntegrityTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainIndexIntegrityTest.java
index 03293f81b6..c14eaa226c 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainIndexIntegrityTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainIndexIntegrityTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainIntegrationTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainIntegrationTest.java
index d858f9e85d..8e28626430 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainIntegrationTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainIntegrationTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainRewardTest.java b/modAionImpl/test/org/aion/zero/impl/BlockchainRewardTest.java
index 5c0cb30de9..611c09963a 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainRewardTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainRewardTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/BlockchainTestUtils.java b/modAionImpl/test/org/aion/zero/impl/BlockchainTestUtils.java
index 8190e27083..0f54c2e0e7 100644
--- a/modAionImpl/test/org/aion/zero/impl/BlockchainTestUtils.java
+++ b/modAionImpl/test/org/aion/zero/impl/BlockchainTestUtils.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import java.math.BigInteger;
diff --git a/modAionImpl/test/org/aion/zero/impl/GenesisSpecificationTest.java b/modAionImpl/test/org/aion/zero/impl/GenesisSpecificationTest.java
index 3c87b474c0..27884a4043 100644
--- a/modAionImpl/test/org/aion/zero/impl/GenesisSpecificationTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/GenesisSpecificationTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/GenesisTestNetJsonTest.java b/modAionImpl/test/org/aion/zero/impl/GenesisTestNetJsonTest.java
index 89a77e15ca..557e97a1c9 100644
--- a/modAionImpl/test/org/aion/zero/impl/GenesisTestNetJsonTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/GenesisTestNetJsonTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/MockRepositoryConfig.java b/modAionImpl/test/org/aion/zero/impl/MockRepositoryConfig.java
index 9edc957817..a86cd506e7 100644
--- a/modAionImpl/test/org/aion/zero/impl/MockRepositoryConfig.java
+++ b/modAionImpl/test/org/aion/zero/impl/MockRepositoryConfig.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import java.util.Properties;
diff --git a/modAionImpl/test/org/aion/zero/impl/PendingStateTest.java b/modAionImpl/test/org/aion/zero/impl/PendingStateTest.java
index 32826954ed..224e906d7c 100644
--- a/modAionImpl/test/org/aion/zero/impl/PendingStateTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/PendingStateTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionImpl/test/org/aion/zero/impl/StandaloneBlockchainTest.java b/modAionImpl/test/org/aion/zero/impl/StandaloneBlockchainTest.java
index d6e4173329..22a23cd8f1 100644
--- a/modAionImpl/test/org/aion/zero/impl/StandaloneBlockchainTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/StandaloneBlockchainTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/blockchain/AionTxExecSummaryTest.java b/modAionImpl/test/org/aion/zero/impl/blockchain/AionTxExecSummaryTest.java
index 67426732ce..54e1df448f 100644
--- a/modAionImpl/test/org/aion/zero/impl/blockchain/AionTxExecSummaryTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/blockchain/AionTxExecSummaryTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/blockchain/ChainConfigurationTest.java b/modAionImpl/test/org/aion/zero/impl/blockchain/ChainConfigurationTest.java
index 72e5c68396..d103141e40 100644
--- a/modAionImpl/test/org/aion/zero/impl/blockchain/ChainConfigurationTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/blockchain/ChainConfigurationTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.blockchain;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/blockchain/PendingTxCacheTest.java b/modAionImpl/test/org/aion/zero/impl/blockchain/PendingTxCacheTest.java
index d799d3661f..f93c4289d6 100644
--- a/modAionImpl/test/org/aion/zero/impl/blockchain/PendingTxCacheTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/blockchain/PendingTxCacheTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.blockchain;
 
 import static org.junit.Assert.assertTrue;
diff --git a/modAionImpl/test/org/aion/zero/impl/cli/ArgumentsTest.java b/modAionImpl/test/org/aion/zero/impl/cli/ArgumentsTest.java
index d8dbb7c8d8..ba1b8cc1fc 100644
--- a/modAionImpl/test/org/aion/zero/impl/cli/ArgumentsTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/cli/ArgumentsTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.cli;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/cli/CliTest.java b/modAionImpl/test/org/aion/zero/impl/cli/CliTest.java
index b9ca5863b0..308b355cd3 100644
--- a/modAionImpl/test/org/aion/zero/impl/cli/CliTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/cli/CliTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.cli;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -107,6 +85,10 @@ public class CliTest {
     private static final File mainnetFork = new File(MAIN_CONFIG_PATH, forkFileName);
     private static final File testnetFork = new File(TEST_CONFIG_PATH, forkFileName);
 
+    private static final String DEFAULT_PORT = "30303";
+    private static final String TEST_PORT = "12345";
+    private static final String INVALID_PORT = "123450";
+
     /** @implNote set this to true to enable printing */
     private static final boolean verbose = false;
 
@@ -608,6 +590,315 @@ public void testConfig_withMigration(String option) {
         Cli.copyRecursively(config, mainnetConfig);
     }
 
+    /** Parameters for testing {@Link #testPort(String[], ReturnType, String, String)}. */
+    @SuppressWarnings("unused")
+    private Object parametersWithPort() {
+        List<Object> parameters = new ArrayList<>();
+
+        String[] portOptions = new String[] {"-p", "--port"};
+        String[] netOptions = new String[] {"-n", "--network"};
+        String[] dirOptions = new String[] {"-d", "--datadir"};
+        String expectedPath = MAIN_BASE_PATH.getAbsolutePath();
+        String expPathOnError = MAIN_BASE_PATH.getAbsolutePath();
+        String expPortOnError = Integer.toString(cfg.getNet().getP2p().getPort());
+
+        // port alone
+        for (String opPort : portOptions) {
+            // without parameter
+            parameters.add(
+                    new Object[] {new String[] {opPort}, ERROR, expPathOnError, expPortOnError});
+            // with two parameters
+            parameters.add(
+                    new Object[] {
+                        new String[] {opPort, TEST_PORT, TEST_PORT},
+                        ERROR,
+                        expPathOnError,
+                        expPortOnError
+                    });
+            // with invalid parameter
+            parameters.add(
+                    new Object[] {
+                        new String[] {opPort, INVALID_PORT}, RUN, expPathOnError, expPortOnError
+                    });
+            parameters.add(
+                    new Object[] {
+                        new String[] {opPort, "-12345"}, RUN, expPathOnError, expPortOnError
+                    });
+            parameters.add(
+                    new Object[] {
+                        new String[] {opPort, "invalid"}, RUN, expPathOnError, expPortOnError
+                    });
+            // with testing port number
+            parameters.add(
+                    new Object[] {new String[] {opPort, TEST_PORT}, RUN, expectedPath, TEST_PORT});
+        }
+
+        // port with help and version
+        for (String opPort : portOptions) {
+            parameters.add(
+                    new Object[] {
+                        new String[] {opPort, TEST_PORT, "-h"}, EXIT, expectedPath, expPortOnError
+                    });
+            parameters.add(
+                    new Object[] {
+                        new String[] {opPort, TEST_PORT, "-v"}, EXIT, expectedPath, expPortOnError
+                    });
+        }
+
+        // network and port
+        String[] netValues = new String[] {"mainnet", "invalid"};
+        for (String opNet : netOptions) {
+            for (String valNet : netValues) {
+                for (String opPort : portOptions) {
+                    // without port parameter
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opNet, valNet, opPort},
+                                ERROR,
+                                expPathOnError,
+                                expPortOnError
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, opNet, valNet},
+                                ERROR,
+                                expPathOnError,
+                                expPortOnError
+                            });
+                    // with invalid port parameter
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opNet, valNet, opPort, INVALID_PORT},
+                                RUN,
+                                expPathOnError,
+                                expPortOnError
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, INVALID_PORT, opNet, valNet},
+                                RUN,
+                                expPathOnError,
+                                expPortOnError
+                            });
+                    // with testing port number
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opNet, valNet, opPort, TEST_PORT},
+                                RUN,
+                                expectedPath,
+                                TEST_PORT
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, TEST_PORT, opNet, valNet},
+                                RUN,
+                                expectedPath,
+                                TEST_PORT
+                            });
+                }
+            }
+        }
+
+        // network and port with testnet
+        netValues = new String[] {"mastery", "testnet"};
+        expectedPath = TEST_BASE_PATH.getAbsolutePath();
+        for (String opNet : netOptions) {
+            for (String valNet : netValues) {
+                for (String opPort : portOptions) {
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opNet, valNet, opPort, TEST_PORT},
+                                RUN,
+                                expectedPath,
+                                TEST_PORT
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, TEST_PORT, opNet, valNet},
+                                RUN,
+                                expectedPath,
+                                TEST_PORT
+                            });
+                }
+            }
+        }
+
+        // directory and port
+        String[] dirValues = new String[] {dataDirectory, path.getAbsolutePath()};
+        expectedPath = new File(path, "mainnet").getAbsolutePath();
+        for (String opDir : dirOptions) {
+            for (String valDir : dirValues) {
+                for (String opPort : portOptions) {
+                    // without port parameter
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opDir, valDir, opPort},
+                                ERROR,
+                                expPathOnError,
+                                expPortOnError
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, opDir, valDir},
+                                ERROR,
+                                expPathOnError,
+                                expPortOnError
+                            });
+                    // with invalid port parameter
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opDir, valDir, opPort, INVALID_PORT},
+                                RUN,
+                                expectedPath,
+                                expPortOnError
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, INVALID_PORT, opDir, valDir},
+                                RUN,
+                                expectedPath,
+                                expPortOnError
+                            });
+                    // with testing port number
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opDir, valDir, opPort, TEST_PORT},
+                                RUN,
+                                expectedPath,
+                                TEST_PORT
+                            });
+                    parameters.add(
+                            new Object[] {
+                                new String[] {opPort, TEST_PORT, opDir, valDir},
+                                RUN,
+                                expectedPath,
+                                TEST_PORT
+                            });
+                }
+            }
+        }
+
+        // network, directory and port
+        netValues = new String[] {"mainnet", "mastery"};
+        for (String opNet : netOptions) {
+            for (String valNet : netValues) {
+                for (String opDir : dirOptions) {
+                    for (String valDir : dirValues) {
+                        for (String opPort : portOptions) {
+                            expectedPath = new File(path, valNet).getAbsolutePath();
+                            parameters.add(
+                                    new Object[] {
+                                        new String[] {
+                                            opNet, valNet, opDir, valDir, opPort, TEST_PORT
+                                        },
+                                        RUN,
+                                        expectedPath,
+                                        TEST_PORT
+                                    });
+                        }
+                    }
+                }
+            }
+        }
+
+        // directory with subdirectories and port
+        String dir = dataDirectory + File.separator + "subfolder";
+        File testPath = new File(BASE_PATH, dir);
+        expectedPath = new File(testPath, "mainnet").getAbsolutePath();
+        for (String opDir : dirOptions) {
+            for (String opPort : portOptions) {
+                // with relative path with subdirectories
+                parameters.add(
+                        new Object[] {
+                            new String[] {opDir, dir, opPort, TEST_PORT},
+                            RUN,
+                            expectedPath,
+                            TEST_PORT
+                        });
+            }
+        }
+
+        // port with config and directory
+        expectedPath = new File(path, "mainnet").getAbsolutePath();
+        for (String opPort : portOptions) {
+            // with relative path
+            parameters.add(
+                    new Object[] {
+                        new String[] {
+                            "--datadir",
+                            path.getAbsolutePath(),
+                            "--config",
+                            "mainnet",
+                            opPort,
+                            TEST_PORT
+                        },
+                        EXIT,
+                        expectedPath,
+                        TEST_PORT
+                    });
+            parameters.add(
+                    new Object[] {
+                        new String[] {
+                            "-c", "mainnet", opPort, TEST_PORT, "--datadir", path.getAbsolutePath()
+                        },
+                        EXIT,
+                        expectedPath,
+                        TEST_PORT
+                    });
+            // with absolute path
+            parameters.add(
+                    new Object[] {
+                        new String[] {
+                            opPort, TEST_PORT, "-d", path.getAbsolutePath(), "--config", "mainnet"
+                        },
+                        EXIT,
+                        expectedPath,
+                        TEST_PORT
+                    });
+            parameters.add(
+                    new Object[] {
+                        new String[] {
+                            "-c", "mainnet", "-d", path.getAbsolutePath(), opPort, TEST_PORT
+                        },
+                        EXIT,
+                        expectedPath,
+                        TEST_PORT
+                    });
+        }
+
+        return parameters.toArray();
+    }
+
+    @Test
+    @Parameters(method = "parametersWithPort")
+    public void testPort(
+            String[] input, ReturnType expectedReturn, String expectedPath, String expectedPort) {
+
+        cfg.toXML(new String[] {"--p2p=" + "," + DEFAULT_PORT}, cfg.getInitialConfigFile());
+
+        assertThat(cli.call(input, cfg)).isEqualTo(expectedReturn);
+        assertThat(cfg.getBasePath()).isEqualTo(expectedPath);
+        assertThat(cfg.getExecConfigFile())
+                .isEqualTo(new File(expectedPath, "config" + File.separator + configFileName));
+        assertThat(cfg.getExecGenesisFile())
+                .isEqualTo(new File(expectedPath, "config" + File.separator + genesisFileName));
+        assertThat(cfg.getExecForkFile())
+                .isEqualTo(new File(expectedPath, "config" + File.separator + forkFileName));
+        assertThat(cfg.getDatabaseDir()).isEqualTo(new File(expectedPath, "database"));
+        assertThat(cfg.getLogDir()).isEqualTo(new File(expectedPath, "log"));
+        assertThat(cfg.getKeystoreDir()).isEqualTo(new File(expectedPath, "keystore"));
+        // test port is updated
+        assertThat(Integer.toString(cfg.getNet().getP2p().getPort())).isEqualTo(expectedPort);
+        // test port in initial config is unchanged
+        cfg.resetInternal();
+        cfg.fromXML();
+        assertThat(Integer.toString(cfg.getNet().getP2p().getPort())).isEqualTo(DEFAULT_PORT);
+
+        if (verbose) {
+            printPaths(cfg);
+        }
+    }
+
     /** Parameters for testing {@link #testInfo(String[], ReturnType, String)}. */
     @SuppressWarnings("unused")
     private Object parametersWithInfo() {
@@ -659,8 +950,36 @@ private Object parametersWithInfo() {
                     });
         }
 
+        // with port
+        expected = MAIN_BASE_PATH.getAbsolutePath();
+        for (String op : options) {
+            // test port number as parameter
+            parameters.add(new Object[] {new String[] {op, "-p", TEST_PORT}, EXIT, expected});
+            parameters.add(new Object[] {new String[] {"-p", TEST_PORT, op}, EXIT, expected});
+            // invalid port parameter
+            parameters.add(new Object[] {new String[] {op, "-p", INVALID_PORT}, EXIT, expOnError});
+        }
+
+        // with port and directory
+        expected = new File(path, "mainnet").getAbsolutePath();
+        for (String op : options) {
+            // with relative path
+            parameters.add(
+                    new Object[] {
+                        new String[] {op, "-d", dataDirectory, "-p", TEST_PORT}, EXIT, expected
+                    });
+            // with absolute path
+            parameters.add(
+                    new Object[] {
+                        new String[] {op, "-p", TEST_PORT, "-d", path.getAbsolutePath()},
+                        EXIT,
+                        expected
+                    });
+        }
+
         // with network and directory
         expected = new File(path, "mastery").getAbsolutePath();
+
         for (String op : options) {
             // with relative path
             parameters.add(
@@ -1155,81 +1474,97 @@ private Object parametersForArgumentCheck() {
         Set<String> skippedTasks;
 
         input = new String[] {"--info"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         parameters.add(new Object[] {input, TaskPriority.INFO, skippedTasks});
 
         input = new String[] {"--account list", "--account create"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--account list");
         parameters.add(new Object[] {input, TaskPriority.CREATE_ACCOUNT, skippedTasks});
 
         input = new String[] {"--info", "--config", "mainnet", "-s create"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--info");
         skippedTasks.add("-s create");
         parameters.add(new Object[] {input, TaskPriority.CONFIG, skippedTasks});
 
+        input = new String[] {"--help", "--port", TEST_PORT};
+        skippedTasks = new HashSet<>();
+        skippedTasks.add("--port");
+        parameters.add(new Object[] {input, TaskPriority.HELP, skippedTasks});
+
         input = new String[] {"--help", "--network", "mainnet", "--datadir", dataDirectory};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--network");
         skippedTasks.add("--datadir");
         parameters.add(new Object[] {input, TaskPriority.HELP, skippedTasks});
 
+        input = new String[] {"--version", "--port", TEST_PORT, "--datadir", dataDirectory};
+        skippedTasks = new HashSet<>();
+        skippedTasks.add("--port");
+        skippedTasks.add("--datadir");
+        parameters.add(new Object[] {input, TaskPriority.VERSION, skippedTasks});
+
         input = new String[] {"--version", "-v"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
+        parameters.add(new Object[] {input, TaskPriority.VERSION, skippedTasks});
+
+        input = new String[] {"--version", "--port", TEST_PORT};
+        skippedTasks = new HashSet<>();
+        skippedTasks.add("--port");
         parameters.add(new Object[] {input, TaskPriority.VERSION, skippedTasks});
 
         input = new String[] {"--dump-blocks", "5", "--dump-state", "5", "--dump-state-size", "5"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--dump-blocks");
         skippedTasks.add("--dump-state");
         parameters.add(new Object[] {input, TaskPriority.DUMP_STATE_SIZE, skippedTasks});
 
         input = new String[] {"ac", "ae", "account"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--account export");
         parameters.add(new Object[] {input, TaskPriority.CREATE_ACCOUNT, skippedTasks});
 
         input = new String[] {"--prune-blocks", "--state", "FULL"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--state");
         parameters.add(new Object[] {input, TaskPriority.PRUNE_BLOCKS, skippedTasks});
 
         input = new String[] {"-h", "-v"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("-v");
         parameters.add(new Object[] {input, TaskPriority.HELP, skippedTasks});
 
         input = new String[] {"-h", "--version"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--version");
         parameters.add(new Object[] {input, TaskPriority.HELP, skippedTasks});
 
         input = new String[] {"-h", "-c"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--config");
         parameters.add(new Object[] {input, TaskPriority.HELP, skippedTasks});
 
         input = new String[] {"-i", "ac"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--account create");
         parameters.add(new Object[] {input, TaskPriority.INFO, skippedTasks});
 
         ECKey key = ECKeyFac.inst().create();
         String pKey = Hex.toHexString(key.getPrivKeyBytes());
         input = new String[] {"-c", "ai", pKey};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--account import");
         parameters.add(new Object[] {input, TaskPriority.CONFIG, skippedTasks});
 
         input = new String[] {"-s create", "-r", "100", "pb"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--revert");
         skippedTasks.add("--prune-blocks");
         parameters.add(new Object[] {input, TaskPriority.SSL, skippedTasks});
 
         input = new String[] {"-r", "100", "--state", "FULL", "--dump-state-size", "--db-compact"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--state");
         skippedTasks.add("--dump-state-size");
         skippedTasks.add("--db-compact");
@@ -1239,24 +1574,24 @@ private Object parametersForArgumentCheck() {
                 new String[] {
                     "--state", "FULL", "--db-compact", "--dump-state-size", "--dump-state"
                 };
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--db-compact");
         skippedTasks.add("--dump-state-size");
         skippedTasks.add("--dump-state");
         parameters.add(new Object[] {input, TaskPriority.PRUNE_STATE, skippedTasks});
 
         input = new String[] {"--dump-state-size", "--dump-state"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--dump-state");
         parameters.add(new Object[] {input, TaskPriority.DUMP_STATE_SIZE, skippedTasks});
 
         input = new String[] {"--dump-state", "--dump-blocks"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--dump-blocks");
         parameters.add(new Object[] {input, TaskPriority.DUMP_STATE, skippedTasks});
 
         input = new String[] {"--dump-blocks", "--db-compact"};
-        skippedTasks = new HashSet<String>();
+        skippedTasks = new HashSet<>();
         skippedTasks.add("--db-compact");
         parameters.add(new Object[] {input, TaskPriority.DUMP_BLOCKS, skippedTasks});
 
diff --git a/modAionImpl/test/org/aion/zero/impl/config/NetworkTest.java b/modAionImpl/test/org/aion/zero/impl/config/NetworkTest.java
index c21dfd5de8..f293caf011 100644
--- a/modAionImpl/test/org/aion/zero/impl/config/NetworkTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/config/NetworkTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.config;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/config/dynamic/ConfigProposalResultTest.java b/modAionImpl/test/org/aion/zero/impl/config/dynamic/ConfigProposalResultTest.java
index 59c9e6cea3..0e9b5f55e6 100644
--- a/modAionImpl/test/org/aion/zero/impl/config/dynamic/ConfigProposalResultTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/config/dynamic/ConfigProposalResultTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.config.dynamic;
 
 import static org.hamcrest.Matchers.is;
diff --git a/modAionImpl/test/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistryTest.java b/modAionImpl/test/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistryTest.java
index 375ac9a047..031eb1db68 100644
--- a/modAionImpl/test/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistryTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/config/dynamic/DynamicConfigKeyRegistryTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.config.dynamic;
 
 import static org.hamcrest.Matchers.is;
diff --git a/modAionImpl/test/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverTest.java b/modAionImpl/test/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverTest.java
index 1c013b3ac4..06496f91df 100644
--- a/modAionImpl/test/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/config/dynamic/InFlightConfigReceiverTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.config.dynamic;
 
 import static org.hamcrest.Matchers.is;
diff --git a/modAionImpl/test/org/aion/zero/impl/core/BloomFilterTest.java b/modAionImpl/test/org/aion/zero/impl/core/BloomFilterTest.java
index 021edc1e66..266b41cf43 100644
--- a/modAionImpl/test/org/aion/zero/impl/core/BloomFilterTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/core/BloomFilterTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.core;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/core/OriginalDifficultyFunctionTest.java b/modAionImpl/test/org/aion/zero/impl/core/OriginalDifficultyFunctionTest.java
index 10c4be8e7b..9ffad51295 100644
--- a/modAionImpl/test/org/aion/zero/impl/core/OriginalDifficultyFunctionTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/core/OriginalDifficultyFunctionTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.core;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/core/ScalingDifficultyFunctionTest.java b/modAionImpl/test/org/aion/zero/impl/core/ScalingDifficultyFunctionTest.java
index ec4e15baeb..12b82afcd2 100644
--- a/modAionImpl/test/org/aion/zero/impl/core/ScalingDifficultyFunctionTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/core/ScalingDifficultyFunctionTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.core;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/core/energy/ClampedDecayingEnergyLimitTest.java b/modAionImpl/test/org/aion/zero/impl/core/energy/ClampedDecayingEnergyLimitTest.java
index 9ca70408aa..01aefdbeb7 100644
--- a/modAionImpl/test/org/aion/zero/impl/core/energy/ClampedDecayingEnergyLimitTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/core/energy/ClampedDecayingEnergyLimitTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/core/energy/GeneralEnergyLimitTests.java b/modAionImpl/test/org/aion/zero/impl/core/energy/GeneralEnergyLimitTests.java
index 4753e42db8..d97d21691c 100644
--- a/modAionImpl/test/org/aion/zero/impl/core/energy/GeneralEnergyLimitTests.java
+++ b/modAionImpl/test/org/aion/zero/impl/core/energy/GeneralEnergyLimitTests.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/core/energy/TargettedEnergyLimitStrategyTest.java b/modAionImpl/test/org/aion/zero/impl/core/energy/TargettedEnergyLimitStrategyTest.java
index 97de2665f3..a32922b823 100644
--- a/modAionImpl/test/org/aion/zero/impl/core/energy/TargettedEnergyLimitStrategyTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/core/energy/TargettedEnergyLimitStrategyTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.core.energy;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/db/AionRepositoryImplTest.java b/modAionImpl/test/org/aion/zero/impl/db/AionRepositoryImplTest.java
index 77b6204a86..0c2365fe45 100644
--- a/modAionImpl/test/org/aion/zero/impl/db/AionRepositoryImplTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/db/AionRepositoryImplTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.db;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/db/BlockInfoTest.java b/modAionImpl/test/org/aion/zero/impl/db/BlockInfoTest.java
index 90fa4ea8a7..3a91a98b14 100644
--- a/modAionImpl/test/org/aion/zero/impl/db/BlockInfoTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/db/BlockInfoTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.db;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/db/PendingBlockStoreTest.java b/modAionImpl/test/org/aion/zero/impl/db/PendingBlockStoreTest.java
index 409047f9b4..860c088bbd 100644
--- a/modAionImpl/test/org/aion/zero/impl/db/PendingBlockStoreTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/db/PendingBlockStoreTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.db;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/BlockPropagationTest.java b/modAionImpl/test/org/aion/zero/impl/sync/BlockPropagationTest.java
index ce9d2be4e9..a5d5747317 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/BlockPropagationTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/BlockPropagationTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.sync;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/SyncStatsTest.java b/modAionImpl/test/org/aion/zero/impl/sync/SyncStatsTest.java
index a2ad97b539..fd108ca9b4 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/SyncStatsTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/SyncStatsTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.zero.impl.sync;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/TaskImportBlocksTest.java b/modAionImpl/test/org/aion/zero/impl/sync/TaskImportBlocksTest.java
index 62d7a58e9c..686d848fb8 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/TaskImportBlocksTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/TaskImportBlocksTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.zero.impl.sync;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/msg/BroadcastNewBlockTest.java b/modAionImpl/test/org/aion/zero/impl/sync/msg/BroadcastNewBlockTest.java
index 7fa8cdfb4a..30441e2775 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/msg/BroadcastNewBlockTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/msg/BroadcastNewBlockTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.sync.msg;
 
 import org.junit.Test;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/msg/ReqHeadersTest.java b/modAionImpl/test/org/aion/zero/impl/sync/msg/ReqHeadersTest.java
index 41d6feb65b..976adfe321 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/msg/ReqHeadersTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/msg/ReqHeadersTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.sync.msg;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/msg/ResBlocksHeadersTest.java b/modAionImpl/test/org/aion/zero/impl/sync/msg/ResBlocksHeadersTest.java
index 5b073d77be..01bbb7df6f 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/msg/ResBlocksHeadersTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/msg/ResBlocksHeadersTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.sync.msg;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/sync/msg/ResStatusTest.java b/modAionImpl/test/org/aion/zero/impl/sync/msg/ResStatusTest.java
index ba99a235f4..48fe05bdaf 100644
--- a/modAionImpl/test/org/aion/zero/impl/sync/msg/ResStatusTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/sync/msg/ResStatusTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.sync.msg;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modAionImpl/test/org/aion/zero/impl/types/A0BlockHeaderTest.java b/modAionImpl/test/org/aion/zero/impl/types/A0BlockHeaderTest.java
index a578c26326..6dd9fc36dc 100644
--- a/modAionImpl/test/org/aion/zero/impl/types/A0BlockHeaderTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/types/A0BlockHeaderTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.types;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -80,7 +46,8 @@ public void testBlockHeaderFromSafeBuilder() throws Exception {
                 .withEnergyConsumed(ENERGY_CONSUMED_BYTES)
                 .withEnergyLimit(ENERGY_LIMIT_BYTES)
                 .withParentHash(PARENT_HASH)
-                .withNonce(NONCE_BYTES);
+                .withNonce(NONCE_BYTES)
+                .withVersion((byte) 0x01);
 
         A0BlockHeader header = builder.build();
 
@@ -95,6 +62,7 @@ public void testBlockHeaderFromSafeBuilder() throws Exception {
         assertThat(header.getEnergyLimit()).isEqualTo(ENERGY_LIMIT);
         assertThat(header.getSolution()).isEqualTo(new byte[1408]);
         assertThat(header.getNonce()).isEqualTo(NONCE_BYTES);
+        assertThat(header.getVersion() == (byte) 0x01);
     }
 
     @Test
@@ -113,7 +81,8 @@ public void testBlockHeaderFromUnsafeSource() throws Exception {
                 .withNumber(NUMBER_BYTES)
                 .withEnergyConsumed(ENERGY_CONSUMED_BYTES)
                 .withEnergyLimit(ENERGY_LIMIT_BYTES)
-                .withParentHash(PARENT_HASH);
+                .withParentHash(PARENT_HASH)
+                .withVersion((byte) 0x01);
 
         A0BlockHeader header = builder.build();
 
@@ -129,6 +98,7 @@ public void testBlockHeaderFromUnsafeSource() throws Exception {
         assertThat(header.getSolution()).isEqualTo(new byte[1408]);
         assertThat(header.getNonce()).isEqualTo(ByteUtil.EMPTY_WORD);
         assertThat(header.getDifficulty()).isEqualTo(ByteUtil.EMPTY_HALFWORD);
+        assertThat(header.getVersion() == (byte) 0x01);
     }
 
     // Test is a self referencing
@@ -148,7 +118,8 @@ public void testBlockHeaderFromRLP() throws Exception {
                 .withEnergyConsumed(ENERGY_CONSUMED_BYTES)
                 .withEnergyLimit(ENERGY_LIMIT_BYTES)
                 .withParentHash(PARENT_HASH)
-                .withNonce(NONCE_BYTES);
+                .withNonce(NONCE_BYTES)
+                .withVersion((byte) 0x01);
 
         A0BlockHeader header = builder.build();
         byte[] encoded = header.getEncoded();
@@ -165,6 +136,7 @@ public void testBlockHeaderFromRLP() throws Exception {
         assertThat(reconstructed.getParentHash()).isEqualTo(header.getParentHash());
         assertThat(reconstructed.getNonce()).isEqualTo(header.getNonce());
         assertThat(reconstructed.getDifficulty()).isEqualTo(header.getDifficulty());
+        assertThat(reconstructed.getVersion() == header.getVersion());
 
         byte[] difficulty = reconstructed.getDifficulty();
     }
diff --git a/modAionImpl/test/org/aion/zero/impl/valid/AionBlockHeaderVersionTest.java b/modAionImpl/test/org/aion/zero/impl/valid/AionBlockHeaderVersionTest.java
index 160b425e70..c6f651a9c8 100644
--- a/modAionImpl/test/org/aion/zero/impl/valid/AionBlockHeaderVersionTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/valid/AionBlockHeaderVersionTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/valid/AionPOWRuleTest.java b/modAionImpl/test/org/aion/zero/impl/valid/AionPOWRuleTest.java
index 134c5bc150..b4db90afdd 100644
--- a/modAionImpl/test/org/aion/zero/impl/valid/AionPOWRuleTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/valid/AionPOWRuleTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/valid/EnergyConsumedRuleTest.java b/modAionImpl/test/org/aion/zero/impl/valid/EnergyConsumedRuleTest.java
index ecc41a20bc..b5c424cf11 100644
--- a/modAionImpl/test/org/aion/zero/impl/valid/EnergyConsumedRuleTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/valid/EnergyConsumedRuleTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/valid/EnergyLimitRuleTest.java b/modAionImpl/test/org/aion/zero/impl/valid/EnergyLimitRuleTest.java
index 1b74e92a6a..b8f52e040b 100644
--- a/modAionImpl/test/org/aion/zero/impl/valid/EnergyLimitRuleTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/valid/EnergyLimitRuleTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.zero.impl.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modAionImpl/test/org/aion/zero/impl/valid/ExtraDataRuleTest.java b/modAionImpl/test/org/aion/zero/impl/valid/ExtraDataRuleTest.java
index dd94f2e96f..b6f722abd0 100644
--- a/modAionImpl/test/org/aion/zero/impl/valid/ExtraDataRuleTest.java
+++ b/modAionImpl/test/org/aion/zero/impl/valid/ExtraDataRuleTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.zero.impl.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modApiServer/build.gradle b/modApiServer/build.gradle
index 219f0f2f76..103c3ac14c 100644
--- a/modApiServer/build.gradle
+++ b/modApiServer/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.5.0'
     compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.0'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
-    //testCompile group: 'commons-codec', name: 'commons-codec', version: '1.10' 
     compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
     compile group: 'org.nanohttpd', name: 'nanohttpd', version: '2.3.1'
     compile group: 'org.jboss.logging', name: 'jboss-logging', version: '3.3.0.Final'
diff --git a/modApiServer/src/module-info.java b/modApiServer/src/module-info.java
index e48ae95fa9..4d33152131 100644
--- a/modApiServer/src/module-info.java
+++ b/modApiServer/src/module-info.java
@@ -19,6 +19,7 @@
     requires libnzmq;
     requires com.github.benmanes.caffeine;
     requires com.google.common;
+    requires jdk.unsupported;
 
     exports org.aion.api.server.pb;
     exports org.aion.api.server.zmq;
diff --git a/modApiServer/src/org/aion/api/server/Api.java b/modApiServer/src/org/aion/api/server/Api.java
index 7e4ad864b9..584b17a322 100644
--- a/modApiServer/src/org/aion/api/server/Api.java
+++ b/modApiServer/src/org/aion/api/server/Api.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/modApiServer/src/org/aion/api/server/ApiAion.java b/modApiServer/src/org/aion/api/server/ApiAion.java
index 8ebf426fbd..997c97c284 100644
--- a/modApiServer/src/org/aion/api/server/ApiAion.java
+++ b/modApiServer/src/org/aion/api/server/ApiAion.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server;
 
 import static org.aion.evtmgr.impl.evt.EventTx.STATE.GETSTATE;
diff --git a/modApiServer/src/org/aion/api/server/ApiTxResponse.java b/modApiServer/src/org/aion/api/server/ApiTxResponse.java
index 3ef006076f..47f82666ea 100644
--- a/modApiServer/src/org/aion/api/server/ApiTxResponse.java
+++ b/modApiServer/src/org/aion/api/server/ApiTxResponse.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server;
 
 import org.aion.base.type.Address;
diff --git a/modApiServer/src/org/aion/api/server/ApiUtil.java b/modApiServer/src/org/aion/api/server/ApiUtil.java
index 7918fc3e68..61a7c24364 100644
--- a/modApiServer/src/org/aion/api/server/ApiUtil.java
+++ b/modApiServer/src/org/aion/api/server/ApiUtil.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server;
 
 import java.nio.ByteBuffer;
diff --git a/modApiServer/src/org/aion/api/server/IApiAion.java b/modApiServer/src/org/aion/api/server/IApiAion.java
index bcff06cff7..b018d9c547 100644
--- a/modApiServer/src/org/aion/api/server/IApiAion.java
+++ b/modApiServer/src/org/aion/api/server/IApiAion.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server;
 
 import java.util.Map;
diff --git a/modApiServer/src/org/aion/api/server/http/RpcServer.java b/modApiServer/src/org/aion/api/server/http/RpcServer.java
index e3cf2543c5..4ff5d922f8 100644
--- a/modApiServer/src/org/aion/api/server/http/RpcServer.java
+++ b/modApiServer/src/org/aion/api/server/http/RpcServer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http;
 
 import java.io.File;
diff --git a/modApiServer/src/org/aion/api/server/http/RpcServerBuilder.java b/modApiServer/src/org/aion/api/server/http/RpcServerBuilder.java
index 8a20cde6ab..7b70380ad2 100644
--- a/modApiServer/src/org/aion/api/server/http/RpcServerBuilder.java
+++ b/modApiServer/src/org/aion/api/server/http/RpcServerBuilder.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http;
 
 import java.util.ArrayList;
diff --git a/modApiServer/src/org/aion/api/server/http/RpcServerVendor.java b/modApiServer/src/org/aion/api/server/http/RpcServerVendor.java
index 26f46e5a00..32b043fedc 100644
--- a/modApiServer/src/org/aion/api/server/http/RpcServerVendor.java
+++ b/modApiServer/src/org/aion/api/server/http/RpcServerVendor.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http;
 
 import java.util.Optional;
diff --git a/modApiServer/src/org/aion/api/server/http/nano/AionHttpd.java b/modApiServer/src/org/aion/api/server/http/nano/AionHttpd.java
index 2b9ede388c..1d92f95d2e 100644
--- a/modApiServer/src/org/aion/api/server/http/nano/AionHttpd.java
+++ b/modApiServer/src/org/aion/api/server/http/nano/AionHttpd.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.nano;
 
 import fi.iki.elonen.NanoHTTPD;
diff --git a/modApiServer/src/org/aion/api/server/http/nano/AionHttpdThreadFactory.java b/modApiServer/src/org/aion/api/server/http/nano/AionHttpdThreadFactory.java
index 5da7587a1c..d84321d968 100644
--- a/modApiServer/src/org/aion/api/server/http/nano/AionHttpdThreadFactory.java
+++ b/modApiServer/src/org/aion/api/server/http/nano/AionHttpdThreadFactory.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.nano;
 
 import java.util.concurrent.ThreadFactory;
diff --git a/modApiServer/src/org/aion/api/server/http/nano/BoundRunner.java b/modApiServer/src/org/aion/api/server/http/nano/BoundRunner.java
index eff1871df1..06d992d0b1 100644
--- a/modApiServer/src/org/aion/api/server/http/nano/BoundRunner.java
+++ b/modApiServer/src/org/aion/api/server/http/nano/BoundRunner.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.nano;
 
 import fi.iki.elonen.NanoHTTPD;
diff --git a/modApiServer/src/org/aion/api/server/http/nano/NanoRpcServer.java b/modApiServer/src/org/aion/api/server/http/nano/NanoRpcServer.java
index 961a31ec10..0b644d03a4 100644
--- a/modApiServer/src/org/aion/api/server/http/nano/NanoRpcServer.java
+++ b/modApiServer/src/org/aion/api/server/http/nano/NanoRpcServer.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.http.nano;
 
 import fi.iki.elonen.NanoHTTPD;
diff --git a/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRootHandler.java b/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRootHandler.java
index 1e45fa3998..f0e71010f8 100644
--- a/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRootHandler.java
+++ b/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRootHandler.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.undertow;
 
 import io.undertow.server.HttpHandler;
diff --git a/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRpcHandler.java b/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRpcHandler.java
index ac1c2e4c88..970d04f6af 100644
--- a/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRpcHandler.java
+++ b/modApiServer/src/org/aion/api/server/http/undertow/AionUndertowRpcHandler.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.undertow;
 
 import io.undertow.server.HttpHandler;
diff --git a/modApiServer/src/org/aion/api/server/http/undertow/RequestLimitingConfiguration.java b/modApiServer/src/org/aion/api/server/http/undertow/RequestLimitingConfiguration.java
index 70b333e4b2..a873de0e37 100644
--- a/modApiServer/src/org/aion/api/server/http/undertow/RequestLimitingConfiguration.java
+++ b/modApiServer/src/org/aion/api/server/http/undertow/RequestLimitingConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.undertow;
 
 public class RequestLimitingConfiguration {
diff --git a/modApiServer/src/org/aion/api/server/http/undertow/StuckThreadDetectorConfiguration.java b/modApiServer/src/org/aion/api/server/http/undertow/StuckThreadDetectorConfiguration.java
index 010791e82f..abba95a17f 100644
--- a/modApiServer/src/org/aion/api/server/http/undertow/StuckThreadDetectorConfiguration.java
+++ b/modApiServer/src/org/aion/api/server/http/undertow/StuckThreadDetectorConfiguration.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.undertow;
 
 public class StuckThreadDetectorConfiguration {
diff --git a/modApiServer/src/org/aion/api/server/http/undertow/UndertowRpcServer.java b/modApiServer/src/org/aion/api/server/http/undertow/UndertowRpcServer.java
index a250507298..cb26b28d38 100644
--- a/modApiServer/src/org/aion/api/server/http/undertow/UndertowRpcServer.java
+++ b/modApiServer/src/org/aion/api/server/http/undertow/UndertowRpcServer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.http.undertow;
 
 import io.undertow.Undertow;
diff --git a/modApiServer/src/org/aion/api/server/nrgprice/INrgPriceAdvisor.java b/modApiServer/src/org/aion/api/server/nrgprice/INrgPriceAdvisor.java
index 30f9fc5c9e..7224e6f509 100644
--- a/modApiServer/src/org/aion/api/server/nrgprice/INrgPriceAdvisor.java
+++ b/modApiServer/src/org/aion/api/server/nrgprice/INrgPriceAdvisor.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.nrgprice;
 
 import org.aion.base.type.IBlock;
diff --git a/modApiServer/src/org/aion/api/server/nrgprice/NrgOracle.java b/modApiServer/src/org/aion/api/server/nrgprice/NrgOracle.java
index b26c626a53..ab8eeb567b 100644
--- a/modApiServer/src/org/aion/api/server/nrgprice/NrgOracle.java
+++ b/modApiServer/src/org/aion/api/server/nrgprice/NrgOracle.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.nrgprice;
 
 import org.aion.api.server.nrgprice.strategy.NrgBlockPrice;
diff --git a/modApiServer/src/org/aion/api/server/nrgprice/NrgPriceAdvisor.java b/modApiServer/src/org/aion/api/server/nrgprice/NrgPriceAdvisor.java
index bd5562f36d..85ec845d97 100644
--- a/modApiServer/src/org/aion/api/server/nrgprice/NrgPriceAdvisor.java
+++ b/modApiServer/src/org/aion/api/server/nrgprice/NrgPriceAdvisor.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.nrgprice;
 
 import org.aion.base.type.IBlock;
diff --git a/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPrice.java b/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPrice.java
index df1684e6f9..5311bb8345 100644
--- a/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPrice.java
+++ b/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPrice.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.nrgprice.strategy;
 
 import java.util.Arrays;
diff --git a/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPriceAveraging.java b/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPriceAveraging.java
index 4a9be337a8..e5f38ba719 100644
--- a/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPriceAveraging.java
+++ b/modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPriceAveraging.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.nrgprice.strategy;
 
 import java.math.BigInteger;
diff --git a/modApiServer/src/org/aion/api/server/pb/ApiAion0.java b/modApiServer/src/org/aion/api/server/pb/ApiAion0.java
index b7233a727e..c664a4056c 100644
--- a/modApiServer/src/org/aion/api/server/pb/ApiAion0.java
+++ b/modApiServer/src/org/aion/api/server/pb/ApiAion0.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.pb;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modApiServer/src/org/aion/api/server/pb/IHdlr.java b/modApiServer/src/org/aion/api/server/pb/IHdlr.java
index d89bf370e1..0972cfce47 100644
--- a/modApiServer/src/org/aion/api/server/pb/IHdlr.java
+++ b/modApiServer/src/org/aion/api/server/pb/IHdlr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.pb;
 
 /** */
diff --git a/modApiServer/src/org/aion/api/server/pb/Message.java b/modApiServer/src/org/aion/api/server/pb/Message.java
index 77406fedd9..ea40a09bfc 100644
--- a/modApiServer/src/org/aion/api/server/pb/Message.java
+++ b/modApiServer/src/org/aion/api/server/pb/Message.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: message.proto
 
diff --git a/modApiServer/src/org/aion/api/server/pb/TxWaitingMappingUpdate.java b/modApiServer/src/org/aion/api/server/pb/TxWaitingMappingUpdate.java
index 1cf84585f9..85bb069779 100644
--- a/modApiServer/src/org/aion/api/server/pb/TxWaitingMappingUpdate.java
+++ b/modApiServer/src/org/aion/api/server/pb/TxWaitingMappingUpdate.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.pb;
 
 import org.aion.base.util.ByteArrayWrapper;
diff --git a/modApiServer/src/org/aion/api/server/rpc/ApiWeb3Aion.java b/modApiServer/src/org/aion/api/server/rpc/ApiWeb3Aion.java
index 1b8402a6ab..44c8147422 100644
--- a/modApiServer/src/org/aion/api/server/rpc/ApiWeb3Aion.java
+++ b/modApiServer/src/org/aion/api/server/rpc/ApiWeb3Aion.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 import static java.util.stream.Collectors.toList;
diff --git a/modApiServer/src/org/aion/api/server/rpc/RpcError.java b/modApiServer/src/org/aion/api/server/rpc/RpcError.java
index 49c34bd54f..265346bef0 100644
--- a/modApiServer/src/org/aion/api/server/rpc/RpcError.java
+++ b/modApiServer/src/org/aion/api/server/rpc/RpcError.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 /**
diff --git a/modApiServer/src/org/aion/api/server/rpc/RpcMethods.java b/modApiServer/src/org/aion/api/server/rpc/RpcMethods.java
index d7da3ef236..2d04ad0e1a 100644
--- a/modApiServer/src/org/aion/api/server/rpc/RpcMethods.java
+++ b/modApiServer/src/org/aion/api/server/rpc/RpcMethods.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 import java.util.HashMap;
diff --git a/modApiServer/src/org/aion/api/server/rpc/RpcMsg.java b/modApiServer/src/org/aion/api/server/rpc/RpcMsg.java
index cd5e129c6d..cf41580cbb 100644
--- a/modApiServer/src/org/aion/api/server/rpc/RpcMsg.java
+++ b/modApiServer/src/org/aion/api/server/rpc/RpcMsg.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 import org.json.JSONObject;
diff --git a/modApiServer/src/org/aion/api/server/rpc/RpcProcessor.java b/modApiServer/src/org/aion/api/server/rpc/RpcProcessor.java
index d09e91d703..3b8e3554bc 100644
--- a/modApiServer/src/org/aion/api/server/rpc/RpcProcessor.java
+++ b/modApiServer/src/org/aion/api/server/rpc/RpcProcessor.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 import com.google.common.base.Stopwatch;
diff --git a/modApiServer/src/org/aion/api/server/types/ArgFltr.java b/modApiServer/src/org/aion/api/server/types/ArgFltr.java
index 3bf550e1fd..7b16e082f6 100644
--- a/modApiServer/src/org/aion/api/server/types/ArgFltr.java
+++ b/modApiServer/src/org/aion/api/server/types/ArgFltr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.util.ArrayList;
diff --git a/modApiServer/src/org/aion/api/server/types/ArgTxCall.java b/modApiServer/src/org/aion/api/server/types/ArgTxCall.java
index cb2eb553e2..c12f92cf14 100644
--- a/modApiServer/src/org/aion/api/server/types/ArgTxCall.java
+++ b/modApiServer/src/org/aion/api/server/types/ArgTxCall.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.math.BigInteger;
diff --git a/modApiServer/src/org/aion/api/server/types/Blk.java b/modApiServer/src/org/aion/api/server/types/Blk.java
index 6215561df1..51f31eff51 100644
--- a/modApiServer/src/org/aion/api/server/types/Blk.java
+++ b/modApiServer/src/org/aion/api/server/types/Blk.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.math.BigInteger;
diff --git a/modApiServer/src/org/aion/api/server/types/CompiContrInfo.java b/modApiServer/src/org/aion/api/server/types/CompiContrInfo.java
index 1aedbbc874..b105ae5505 100644
--- a/modApiServer/src/org/aion/api/server/types/CompiContrInfo.java
+++ b/modApiServer/src/org/aion/api/server/types/CompiContrInfo.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.solidity.Abi.Entry;
diff --git a/modApiServer/src/org/aion/api/server/types/CompiledContr.java b/modApiServer/src/org/aion/api/server/types/CompiledContr.java
index 20f7ee7b42..5c9c36c549 100644
--- a/modApiServer/src/org/aion/api/server/types/CompiledContr.java
+++ b/modApiServer/src/org/aion/api/server/types/CompiledContr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.json.JSONException;
diff --git a/modApiServer/src/org/aion/api/server/types/Evt.java b/modApiServer/src/org/aion/api/server/types/Evt.java
index d322e8bc1f..39c63051bf 100644
--- a/modApiServer/src/org/aion/api/server/types/Evt.java
+++ b/modApiServer/src/org/aion/api/server/types/Evt.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import static org.aion.api.server.types.Fltr.Type;
diff --git a/modApiServer/src/org/aion/api/server/types/EvtBlk.java b/modApiServer/src/org/aion/api/server/types/EvtBlk.java
index f5796adfb3..74ec3577ae 100644
--- a/modApiServer/src/org/aion/api/server/types/EvtBlk.java
+++ b/modApiServer/src/org/aion/api/server/types/EvtBlk.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import static org.aion.api.server.types.Fltr.Type;
diff --git a/modApiServer/src/org/aion/api/server/types/EvtContract.java b/modApiServer/src/org/aion/api/server/types/EvtContract.java
index d0ba21f0c5..3d98ad7947 100644
--- a/modApiServer/src/org/aion/api/server/types/EvtContract.java
+++ b/modApiServer/src/org/aion/api/server/types/EvtContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import com.google.protobuf.ByteString;
diff --git a/modApiServer/src/org/aion/api/server/types/EvtLg.java b/modApiServer/src/org/aion/api/server/types/EvtLg.java
index 85a1246714..57fd1217d3 100644
--- a/modApiServer/src/org/aion/api/server/types/EvtLg.java
+++ b/modApiServer/src/org/aion/api/server/types/EvtLg.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.api.server.types.Fltr.Type;
diff --git a/modApiServer/src/org/aion/api/server/types/EvtTx.java b/modApiServer/src/org/aion/api/server/types/EvtTx.java
index d329656d9a..f765852a3b 100644
--- a/modApiServer/src/org/aion/api/server/types/EvtTx.java
+++ b/modApiServer/src/org/aion/api/server/types/EvtTx.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.api.server.types.Fltr.Type;
diff --git a/modApiServer/src/org/aion/api/server/types/Fltr.java b/modApiServer/src/org/aion/api/server/types/Fltr.java
index 452dd52117..a97eff6e9e 100644
--- a/modApiServer/src/org/aion/api/server/types/Fltr.java
+++ b/modApiServer/src/org/aion/api/server/types/Fltr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.util.concurrent.ArrayBlockingQueue;
diff --git a/modApiServer/src/org/aion/api/server/types/FltrBlk.java b/modApiServer/src/org/aion/api/server/types/FltrBlk.java
index 04e151d51b..0dd2ba82de 100644
--- a/modApiServer/src/org/aion/api/server/types/FltrBlk.java
+++ b/modApiServer/src/org/aion/api/server/types/FltrBlk.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.base.type.IBlockSummary;
diff --git a/modApiServer/src/org/aion/api/server/types/FltrCt.java b/modApiServer/src/org/aion/api/server/types/FltrCt.java
index 0d60b53148..d5bd949695 100644
--- a/modApiServer/src/org/aion/api/server/types/FltrCt.java
+++ b/modApiServer/src/org/aion/api/server/types/FltrCt.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.util.Arrays;
diff --git a/modApiServer/src/org/aion/api/server/types/FltrLg.java b/modApiServer/src/org/aion/api/server/types/FltrLg.java
index 98f13eecc6..5b8a61d482 100644
--- a/modApiServer/src/org/aion/api/server/types/FltrLg.java
+++ b/modApiServer/src/org/aion/api/server/types/FltrLg.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.util.ArrayList;
diff --git a/modApiServer/src/org/aion/api/server/types/FltrTx.java b/modApiServer/src/org/aion/api/server/types/FltrTx.java
index 8553c5ac96..9c191ad687 100644
--- a/modApiServer/src/org/aion/api/server/types/FltrTx.java
+++ b/modApiServer/src/org/aion/api/server/types/FltrTx.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.base.type.ITransaction;
diff --git a/modApiServer/src/org/aion/api/server/types/NumericalValue.java b/modApiServer/src/org/aion/api/server/types/NumericalValue.java
index f016ecf909..54e2f91bcb 100644
--- a/modApiServer/src/org/aion/api/server/types/NumericalValue.java
+++ b/modApiServer/src/org/aion/api/server/types/NumericalValue.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import java.math.BigInteger;
diff --git a/modApiServer/src/org/aion/api/server/types/SolcOutput.java b/modApiServer/src/org/aion/api/server/types/SolcOutput.java
index e82a262de4..ee3a3db626 100644
--- a/modApiServer/src/org/aion/api/server/types/SolcOutput.java
+++ b/modApiServer/src/org/aion/api/server/types/SolcOutput.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 public class SolcOutput {
diff --git a/modApiServer/src/org/aion/api/server/types/SyncInfo.java b/modApiServer/src/org/aion/api/server/types/SyncInfo.java
index 3caa07e109..5fe0fe2e58 100644
--- a/modApiServer/src/org/aion/api/server/types/SyncInfo.java
+++ b/modApiServer/src/org/aion/api/server/types/SyncInfo.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 public class SyncInfo {
diff --git a/modApiServer/src/org/aion/api/server/types/Tx.java b/modApiServer/src/org/aion/api/server/types/Tx.java
index 1ff12d7e8b..93e57344df 100644
--- a/modApiServer/src/org/aion/api/server/types/Tx.java
+++ b/modApiServer/src/org/aion/api/server/types/Tx.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.base.util.ByteUtil;
diff --git a/modApiServer/src/org/aion/api/server/types/TxPendingStatus.java b/modApiServer/src/org/aion/api/server/types/TxPendingStatus.java
index c99cd48e57..7747c777f9 100644
--- a/modApiServer/src/org/aion/api/server/types/TxPendingStatus.java
+++ b/modApiServer/src/org/aion/api/server/types/TxPendingStatus.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import org.aion.base.util.ByteArrayWrapper;
diff --git a/modApiServer/src/org/aion/api/server/types/TxRecpt.java b/modApiServer/src/org/aion/api/server/types/TxRecpt.java
index b8b7a5122d..60f6a5b93e 100644
--- a/modApiServer/src/org/aion/api/server/types/TxRecpt.java
+++ b/modApiServer/src/org/aion/api/server/types/TxRecpt.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.types;
 
 import static org.aion.base.util.TypeConverter.toJsonHex;
diff --git a/modApiServer/src/org/aion/api/server/types/TxRecptLg.java b/modApiServer/src/org/aion/api/server/types/TxRecptLg.java
index 5581e29ab2..f40014b8db 100644
--- a/modApiServer/src/org/aion/api/server/types/TxRecptLg.java
+++ b/modApiServer/src/org/aion/api/server/types/TxRecptLg.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.types;
 
 import org.aion.base.type.IBlock;
diff --git a/modApiServer/src/org/aion/api/server/zmq/HdlrZmq.java b/modApiServer/src/org/aion/api/server/zmq/HdlrZmq.java
index 87452725d7..614b1e5d44 100644
--- a/modApiServer/src/org/aion/api/server/zmq/HdlrZmq.java
+++ b/modApiServer/src/org/aion/api/server/zmq/HdlrZmq.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.zmq;
 
 import java.util.Map;
diff --git a/modApiServer/src/org/aion/api/server/zmq/ProtocolProcessor.java b/modApiServer/src/org/aion/api/server/zmq/ProtocolProcessor.java
index 8e6afc8855..89fb52200a 100644
--- a/modApiServer/src/org/aion/api/server/zmq/ProtocolProcessor.java
+++ b/modApiServer/src/org/aion/api/server/zmq/ProtocolProcessor.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.zmq;
 
 import static org.aion.api.server.pb.ApiAion0.JAVAAPI_VAR;
diff --git a/modApiServer/src/org/aion/api/server/zmq/Proxy.java b/modApiServer/src/org/aion/api/server/zmq/Proxy.java
index 94fe4c9e27..0ef79a6619 100644
--- a/modApiServer/src/org/aion/api/server/zmq/Proxy.java
+++ b/modApiServer/src/org/aion/api/server/zmq/Proxy.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server.zmq;
 
 import static org.aion.api.server.pb.ApiAion0.heartBeatMsg;
diff --git a/modApiServer/test/org/aion/api/server/ApiAionTest.java b/modApiServer/test/org/aion/api/server/ApiAionTest.java
index f80f3d7cfc..8baa78f252 100644
--- a/modApiServer/test/org/aion/api/server/ApiAionTest.java
+++ b/modApiServer/test/org/aion/api/server/ApiAionTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server;
 
 import static org.aion.base.util.TypeConverter.StringHexToBigInteger;
diff --git a/modApiServer/test/org/aion/api/server/ApiTest.java b/modApiServer/test/org/aion/api/server/ApiTest.java
index 52abc94db1..8b9a9dbbd6 100644
--- a/modApiServer/test/org/aion/api/server/ApiTest.java
+++ b/modApiServer/test/org/aion/api/server/ApiTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modApiServer/test/org/aion/api/server/ApiUtilTest.java b/modApiServer/test/org/aion/api/server/ApiUtilTest.java
index 43e19a9b4c..459816e77c 100644
--- a/modApiServer/test/org/aion/api/server/ApiUtilTest.java
+++ b/modApiServer/test/org/aion/api/server/ApiUtilTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modApiServer/test/org/aion/api/server/TxRecptLgTest.java b/modApiServer/test/org/aion/api/server/TxRecptLgTest.java
index 84c5122314..07912d6f89 100644
--- a/modApiServer/test/org/aion/api/server/TxRecptLgTest.java
+++ b/modApiServer/test/org/aion/api/server/TxRecptLgTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.api.server;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modApiServer/test/org/aion/api/server/pb/ApiAion0Test.java b/modApiServer/test/org/aion/api/server/pb/ApiAion0Test.java
index d0ceb37431..9d6d0adf20 100644
--- a/modApiServer/test/org/aion/api/server/pb/ApiAion0Test.java
+++ b/modApiServer/test/org/aion/api/server/pb/ApiAion0Test.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.pb;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modApiServer/test/org/aion/api/server/rpc/ApiWeb3AionTest.java b/modApiServer/test/org/aion/api/server/rpc/ApiWeb3AionTest.java
index f99f9be675..7ccacb7c08 100644
--- a/modApiServer/test/org/aion/api/server/rpc/ApiWeb3AionTest.java
+++ b/modApiServer/test/org/aion/api/server/rpc/ApiWeb3AionTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 import static org.aion.base.util.TypeConverter.StringHexToBigInteger;
diff --git a/modApiServer/test/org/aion/api/server/rpc/RpcMethodsTest.java b/modApiServer/test/org/aion/api/server/rpc/RpcMethodsTest.java
index 591fcb20d0..8454a4e452 100644
--- a/modApiServer/test/org/aion/api/server/rpc/RpcMethodsTest.java
+++ b/modApiServer/test/org/aion/api/server/rpc/RpcMethodsTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.rpc;
 
 import java.util.ArrayList;
diff --git a/modApiServer/test/org/aion/api/server/types/ArgTxCallTest.java b/modApiServer/test/org/aion/api/server/types/ArgTxCallTest.java
index d58c0ccc33..a348aae261 100644
--- a/modApiServer/test/org/aion/api/server/types/ArgTxCallTest.java
+++ b/modApiServer/test/org/aion/api/server/types/ArgTxCallTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.api.server.types;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modBoot/src/org/aion/Aion.java b/modBoot/src/org/aion/Aion.java
index 6e8a24f101..ea2767be27 100644
--- a/modBoot/src/org/aion/Aion.java
+++ b/modBoot/src/org/aion/Aion.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion;
 
 import static java.lang.System.exit;
diff --git a/modCrypto/build.gradle b/modCrypto/build.gradle
index d9e83b3085..618fdfc4e9 100644
--- a/modCrypto/build.gradle
+++ b/modCrypto/build.gradle
@@ -1,7 +1,7 @@
 ext.moduleName = 'aion.crypto'
 
 dependencies {
-    compile project(':modAionBase')
+    compile project(':modUtil')
     compile project(':modRlp')
     compile files('../lib/libnsc.jar')
     compile 'org.slf4j:slf4j-api:1.7.25'
diff --git a/modCrypto/src/module-info.java b/modCrypto/src/module-info.java
index aacb248737..eb39f04314 100644
--- a/modCrypto/src/module-info.java
+++ b/modCrypto/src/module-info.java
@@ -1,6 +1,6 @@
 module aion.crypto {
     requires slf4j.api;
-    requires aion.base;
+    requires aion.util;
     requires aion.rlp;
     requires libnsc;
 
diff --git a/modCrypto/src/org/aion/crypto/AddressSpecs.java b/modCrypto/src/org/aion/crypto/AddressSpecs.java
index 663cea79c2..fba0d1122d 100644
--- a/modCrypto/src/org/aion/crypto/AddressSpecs.java
+++ b/modCrypto/src/org/aion/crypto/AddressSpecs.java
@@ -1,32 +1,9 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.crypto;
 
 import java.nio.ByteBuffer;
 import java.util.BitSet;
 import java.util.Optional;
-import org.aion.base.util.ByteUtil;
+import org.aion.util.bytes.ByteUtil;
 
 /** A set of static functions to define the creation of addresses */
 public class AddressSpecs {
diff --git a/modCrypto/src/org/aion/crypto/ECKey.java b/modCrypto/src/org/aion/crypto/ECKey.java
index 7a7f5d3a53..04fb6d3efb 100644
--- a/modCrypto/src/org/aion/crypto/ECKey.java
+++ b/modCrypto/src/org/aion/crypto/ECKey.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.crypto;
 
 import java.math.BigInteger;
diff --git a/modCrypto/src/org/aion/crypto/ECKeyFac.java b/modCrypto/src/org/aion/crypto/ECKeyFac.java
index a459f9930f..fa46546db9 100644
--- a/modCrypto/src/org/aion/crypto/ECKeyFac.java
+++ b/modCrypto/src/org/aion/crypto/ECKeyFac.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.crypto;
 
 import static org.aion.crypto.ECKeyFac.ECKeyType.ED25519;
diff --git a/modCrypto/src/org/aion/crypto/Hash256.java b/modCrypto/src/org/aion/crypto/Hash256.java
index 1977735bc5..eab2837c35 100644
--- a/modCrypto/src/org/aion/crypto/Hash256.java
+++ b/modCrypto/src/org/aion/crypto/Hash256.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.crypto;
 
 /** @author jin */
diff --git a/modCrypto/src/org/aion/crypto/HashUtil.java b/modCrypto/src/org/aion/crypto/HashUtil.java
index 80a0944fc7..0f6467e228 100644
--- a/modCrypto/src/org/aion/crypto/HashUtil.java
+++ b/modCrypto/src/org/aion/crypto/HashUtil.java
@@ -1,53 +1,18 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto;
 
 import static java.util.Arrays.copyOfRange;
-import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
 import static org.aion.crypto.HashUtil.H256Type.BLAKE2B_256;
+import static org.aion.util.bytes.ByteUtil.EMPTY_BYTE_ARRAY;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import org.aion.base.util.NativeLoader;
 import org.aion.crypto.hash.Blake2b;
 import org.aion.crypto.hash.Blake2bNative;
 import org.aion.rlp.RLP;
+import org.aion.util.NativeLoader;
 import org.spongycastle.crypto.Digest;
 import org.spongycastle.crypto.digests.KeccakDigest;
 import org.spongycastle.crypto.digests.RIPEMD160Digest;
diff --git a/modCrypto/src/org/aion/crypto/ISignature.java b/modCrypto/src/org/aion/crypto/ISignature.java
index 83da4e7b3a..c3f1a94056 100644
--- a/modCrypto/src/org/aion/crypto/ISignature.java
+++ b/modCrypto/src/org/aion/crypto/ISignature.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.crypto;
 
 /**
diff --git a/modCrypto/src/org/aion/crypto/SignatureFac.java b/modCrypto/src/org/aion/crypto/SignatureFac.java
index e4c85206a7..14e0b9f02d 100644
--- a/modCrypto/src/org/aion/crypto/SignatureFac.java
+++ b/modCrypto/src/org/aion/crypto/SignatureFac.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.crypto;
 
 import org.aion.crypto.ecdsa.ECDSASignature;
diff --git a/modCrypto/src/org/aion/crypto/ecdsa/ECDSASignature.java b/modCrypto/src/org/aion/crypto/ecdsa/ECDSASignature.java
index b94f57019a..5dac267b31 100644
--- a/modCrypto/src/org/aion/crypto/ecdsa/ECDSASignature.java
+++ b/modCrypto/src/org/aion/crypto/ecdsa/ECDSASignature.java
@@ -1,53 +1,17 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.ecdsa;
 
-import static org.aion.base.util.BIUtil.isLessThan;
-import static org.aion.base.util.ByteUtil.bigIntegerToBytes;
 import static org.aion.crypto.ecdsa.ECKeySecp256k1.CURVE;
 import static org.aion.crypto.ecdsa.ECKeySecp256k1.ETH_SECP256K1N;
 import static org.aion.crypto.ecdsa.ECKeySecp256k1.HALF_CURVE_ORDER;
+import static org.aion.util.bytes.ByteUtil.bigIntegerToBytes;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.Hex;
 import org.aion.crypto.ISignature;
+import org.aion.util.bytes.ByteUtil;
+import org.aion.util.conversions.Hex;
 import org.spongycastle.asn1.ASN1InputStream;
 import org.spongycastle.asn1.ASN1Integer;
 import org.spongycastle.asn1.DLSequence;
@@ -162,6 +126,15 @@ public static boolean validateComponents(BigInteger r, BigInteger s, byte v) {
         return isLessThan(s, ETH_SECP256K1N);
     }
 
+    /**
+     * @param valueA - not null
+     * @param valueB - not null
+     * @return true - if the valueA is less than valueB is zero
+     */
+    public static boolean isLessThan(BigInteger valueA, BigInteger valueB) {
+        return valueA.compareTo(valueB) < 0;
+    }
+
     public static ECDSASignature decodeFromDER(byte[] bytes) {
         ASN1InputStream decoder = null;
         try {
diff --git a/modCrypto/src/org/aion/crypto/ecdsa/ECKeySecp256k1.java b/modCrypto/src/org/aion/crypto/ecdsa/ECKeySecp256k1.java
index de358760ec..8c53ebc6dd 100644
--- a/modCrypto/src/org/aion/crypto/ecdsa/ECKeySecp256k1.java
+++ b/modCrypto/src/org/aion/crypto/ecdsa/ECKeySecp256k1.java
@@ -1,42 +1,7 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.ecdsa;
 
 import static java.util.Arrays.copyOfRange;
-import static org.aion.base.util.ByteUtil.bigIntegerToBytes;
+import static org.aion.util.bytes.ByteUtil.bigIntegerToBytes;
 
 import java.io.Serializable;
 import java.math.BigInteger;
diff --git a/modCrypto/src/org/aion/crypto/ed25519/Curve25519.java b/modCrypto/src/org/aion/crypto/ed25519/Curve25519.java
index 4882f60dc6..cc2f137e74 100644
--- a/modCrypto/src/org/aion/crypto/ed25519/Curve25519.java
+++ b/modCrypto/src/org/aion/crypto/ed25519/Curve25519.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.ed25519;
 
 /*
diff --git a/modCrypto/src/org/aion/crypto/ed25519/ECKeyEd25519.java b/modCrypto/src/org/aion/crypto/ed25519/ECKeyEd25519.java
index 10a8f54070..9de63422f5 100644
--- a/modCrypto/src/org/aion/crypto/ed25519/ECKeyEd25519.java
+++ b/modCrypto/src/org/aion/crypto/ed25519/ECKeyEd25519.java
@@ -1,34 +1,11 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.crypto.ed25519;
 
 import java.math.BigInteger;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.NativeLoader;
 import org.aion.crypto.AddressSpecs;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ISignature;
+import org.aion.util.NativeLoader;
+import org.aion.util.bytes.ByteUtil;
 import org.libsodium.jni.NaCl;
 import org.libsodium.jni.Sodium;
 import org.spongycastle.util.encoders.Hex;
@@ -148,6 +125,7 @@ public byte[] getPrivKeyBytes() {
 
     @Override
     public String toString() {
+        // TODO: why is this using Hex from spongycastle lib?
         return "pub:" + Hex.toHexString(pk);
     }
 }
diff --git a/modCrypto/src/org/aion/crypto/ed25519/Ed25519Signature.java b/modCrypto/src/org/aion/crypto/ed25519/Ed25519Signature.java
index 9ab6fa6bb5..c32a9c968f 100644
--- a/modCrypto/src/org/aion/crypto/ed25519/Ed25519Signature.java
+++ b/modCrypto/src/org/aion/crypto/ed25519/Ed25519Signature.java
@@ -1,31 +1,9 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.crypto.ed25519;
 
 import java.util.Arrays;
-import org.aion.base.util.ByteUtil;
 import org.aion.crypto.AddressSpecs;
 import org.aion.crypto.ISignature;
+import org.aion.util.bytes.ByteUtil;
 
 /**
  * ED25519 signature implementation. Each {@link Ed25519Signature} contains two components, public
diff --git a/modCrypto/src/org/aion/crypto/hash/Blake2b.java b/modCrypto/src/org/aion/crypto/hash/Blake2b.java
index 8dad840350..c0b3be16fd 100644
--- a/modCrypto/src/org/aion/crypto/hash/Blake2b.java
+++ b/modCrypto/src/org/aion/crypto/hash/Blake2b.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto.hash;
 
 import static org.aion.crypto.hash.Blake2b.Engine.Assert.assertFail;
diff --git a/modCrypto/src/org/aion/crypto/hash/Blake2bNative.java b/modCrypto/src/org/aion/crypto/hash/Blake2bNative.java
index 1dd0d2c0bf..953c2db163 100644
--- a/modCrypto/src/org/aion/crypto/hash/Blake2bNative.java
+++ b/modCrypto/src/org/aion/crypto/hash/Blake2bNative.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.hash;
 
 public class Blake2bNative {
diff --git a/modCrypto/src/org/aion/crypto/jce/ECAlgorithmParameters.java b/modCrypto/src/org/aion/crypto/jce/ECAlgorithmParameters.java
index 9347aee37e..fa835bcb4b 100644
--- a/modCrypto/src/org/aion/crypto/jce/ECAlgorithmParameters.java
+++ b/modCrypto/src/org/aion/crypto/jce/ECAlgorithmParameters.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.jce;
 
 public final class ECAlgorithmParameters {}
diff --git a/modCrypto/src/org/aion/crypto/jce/ECKeyAgreement.java b/modCrypto/src/org/aion/crypto/jce/ECKeyAgreement.java
index a1db16b129..1a9bca2736 100644
--- a/modCrypto/src/org/aion/crypto/jce/ECKeyAgreement.java
+++ b/modCrypto/src/org/aion/crypto/jce/ECKeyAgreement.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.jce;
 
 import java.security.NoSuchAlgorithmException;
diff --git a/modCrypto/src/org/aion/crypto/jce/ECKeyFactory.java b/modCrypto/src/org/aion/crypto/jce/ECKeyFactory.java
index a644a13517..bc6463d721 100644
--- a/modCrypto/src/org/aion/crypto/jce/ECKeyFactory.java
+++ b/modCrypto/src/org/aion/crypto/jce/ECKeyFactory.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.jce;
 
 import java.security.KeyFactory;
diff --git a/modCrypto/src/org/aion/crypto/jce/ECKeyPairGenerator.java b/modCrypto/src/org/aion/crypto/jce/ECKeyPairGenerator.java
index f517430f1a..2d368a629f 100644
--- a/modCrypto/src/org/aion/crypto/jce/ECKeyPairGenerator.java
+++ b/modCrypto/src/org/aion/crypto/jce/ECKeyPairGenerator.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.jce;
 
 import java.security.InvalidAlgorithmParameterException;
diff --git a/modCrypto/src/org/aion/crypto/jce/ECSignatureFactory.java b/modCrypto/src/org/aion/crypto/jce/ECSignatureFactory.java
index 1d461efcf1..00095b6000 100644
--- a/modCrypto/src/org/aion/crypto/jce/ECSignatureFactory.java
+++ b/modCrypto/src/org/aion/crypto/jce/ECSignatureFactory.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.jce;
 
 import java.security.NoSuchAlgorithmException;
diff --git a/modCrypto/src/org/aion/crypto/jce/SpongyCastleProvider.java b/modCrypto/src/org/aion/crypto/jce/SpongyCastleProvider.java
index 439e199d3b..40d35afb24 100644
--- a/modCrypto/src/org/aion/crypto/jce/SpongyCastleProvider.java
+++ b/modCrypto/src/org/aion/crypto/jce/SpongyCastleProvider.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.crypto.jce;
 
 import java.security.Provider;
diff --git a/modCrypto/src/org/libsodium/jni/SodiumConstants.java b/modCrypto/src/org/libsodium/jni/SodiumConstants.java
index e536298ee0..d13b88d339 100644
--- a/modCrypto/src/org/libsodium/jni/SodiumConstants.java
+++ b/modCrypto/src/org/libsodium/jni/SodiumConstants.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.libsodium.jni;
 
 /**
diff --git a/modCrypto/test/org/aion/crypto/ChecksumTest.java b/modCrypto/test/org/aion/crypto/ChecksumTest.java
index 456f3202d5..25012e679a 100644
--- a/modCrypto/test/org/aion/crypto/ChecksumTest.java
+++ b/modCrypto/test/org/aion/crypto/ChecksumTest.java
@@ -1,32 +1,9 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.crypto;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.Optional;
-import org.aion.base.util.ByteUtil;
+import org.aion.util.bytes.ByteUtil;
 import org.junit.Test;
 
 public class ChecksumTest {
@@ -48,10 +25,8 @@ public void testChecksum() {
 
     @Test
     public void testChecksum0x() {
-        String input =
-                "a0x896b9366f09e5efb1fa2ed9f3820b865ae97adbc6f364d691eb17784c9b1b"; // 0x is not
-                                                                                    // removed, h ==
-                                                                                    // null
+        String input = "a0x896b9366f09e5efb1fa2ed9f3820b865ae97adbc6f364d691eb17784c9b1b";
+        // 0x is not removed, h == null
         assertEquals(Optional.empty(), (AddressSpecs.checksummedAddress(input)));
     }
 
diff --git a/modCrypto/test/org/aion/crypto/ECKeyBench.java b/modCrypto/test/org/aion/crypto/ECKeyBench.java
index efcc3ccd27..9b45dec2df 100644
--- a/modCrypto/test/org/aion/crypto/ECKeyBench.java
+++ b/modCrypto/test/org/aion/crypto/ECKeyBench.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto;
 
 import org.aion.crypto.ecdsa.ECKeySecp256k1;
diff --git a/modCrypto/test/org/aion/crypto/ECKeyTest.java b/modCrypto/test/org/aion/crypto/ECKeyTest.java
index e27424f4d7..14e068e76e 100644
--- a/modCrypto/test/org/aion/crypto/ECKeyTest.java
+++ b/modCrypto/test/org/aion/crypto/ECKeyTest.java
@@ -1,43 +1,9 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 
-import org.aion.base.util.ByteUtil;
+import org.aion.util.bytes.ByteUtil;
 import org.junit.AfterClass;
 import org.junit.Test;
 
diff --git a/modCrypto/test/org/aion/crypto/HashBench.java b/modCrypto/test/org/aion/crypto/HashBench.java
index 60524862e3..9d39ef4cb8 100644
--- a/modCrypto/test/org/aion/crypto/HashBench.java
+++ b/modCrypto/test/org/aion/crypto/HashBench.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modCrypto/test/org/aion/crypto/HashTest.java b/modCrypto/test/org/aion/crypto/HashTest.java
index 36df84f352..757d0984ee 100644
--- a/modCrypto/test/org/aion/crypto/HashTest.java
+++ b/modCrypto/test/org/aion/crypto/HashTest.java
@@ -1,42 +1,8 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto;
 
 import static org.junit.Assert.assertEquals;
 
-import org.aion.base.util.Hex;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 public class HashTest {
diff --git a/modCrypto/test/org/aion/crypto/SignatureTest.java b/modCrypto/test/org/aion/crypto/SignatureTest.java
index 9efb83b5d3..6ed72e6f6a 100644
--- a/modCrypto/test/org/aion/crypto/SignatureTest.java
+++ b/modCrypto/test/org/aion/crypto/SignatureTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto;
 
 import static org.junit.Assert.assertTrue;
diff --git a/modCrypto/test/org/aion/crypto/ecdsa/ECDSATest.java b/modCrypto/test/org/aion/crypto/ecdsa/ECDSATest.java
index 45aa135cd5..b89bcf1850 100644
--- a/modCrypto/test/org/aion/crypto/ecdsa/ECDSATest.java
+++ b/modCrypto/test/org/aion/crypto/ecdsa/ECDSATest.java
@@ -1,41 +1,7 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.crypto.ecdsa;
 
 import java.math.BigInteger;
-import org.aion.base.util.Hex;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 public class ECDSATest {
diff --git a/modCrypto/test/org/aion/crypto/hash/Blake2bTest.java b/modCrypto/test/org/aion/crypto/hash/Blake2bTest.java
index b69199caa5..0adfa85eda 100644
--- a/modCrypto/test/org/aion/crypto/hash/Blake2bTest.java
+++ b/modCrypto/test/org/aion/crypto/hash/Blake2bTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.crypto.hash;
 
 import org.aion.crypto.hash.Blake2b.Engine;
diff --git a/modDbImpl/src/org/aion/db/generic/DatabaseWithCache.java b/modDbImpl/src/org/aion/db/generic/DatabaseWithCache.java
index 8aa1fe8f2f..d2958b2fdd 100644
--- a/modDbImpl/src/org/aion/db/generic/DatabaseWithCache.java
+++ b/modDbImpl/src/org/aion/db/generic/DatabaseWithCache.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.generic;
 
 import com.google.common.cache.CacheBuilder;
diff --git a/modDbImpl/src/org/aion/db/generic/LockedDatabase.java b/modDbImpl/src/org/aion/db/generic/LockedDatabase.java
index c46f71bda8..efb81728c2 100644
--- a/modDbImpl/src/org/aion/db/generic/LockedDatabase.java
+++ b/modDbImpl/src/org/aion/db/generic/LockedDatabase.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.generic;
 
 import java.util.Collection;
diff --git a/modDbImpl/src/org/aion/db/generic/SpecialLockedDatabase.java b/modDbImpl/src/org/aion/db/generic/SpecialLockedDatabase.java
index 71deec77f4..942d5701ff 100644
--- a/modDbImpl/src/org/aion/db/generic/SpecialLockedDatabase.java
+++ b/modDbImpl/src/org/aion/db/generic/SpecialLockedDatabase.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.generic;
 
 import java.util.Collection;
diff --git a/modDbImpl/src/org/aion/db/generic/TimedDatabase.java b/modDbImpl/src/org/aion/db/generic/TimedDatabase.java
index 94c6621dd4..71e2538bf5 100644
--- a/modDbImpl/src/org/aion/db/generic/TimedDatabase.java
+++ b/modDbImpl/src/org/aion/db/generic/TimedDatabase.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.generic;
 
 import java.util.Collection;
diff --git a/modDbImpl/src/org/aion/db/impl/AbstractDB.java b/modDbImpl/src/org/aion/db/impl/AbstractDB.java
index cbf2f611bf..24bf3b3f21 100644
--- a/modDbImpl/src/org/aion/db/impl/AbstractDB.java
+++ b/modDbImpl/src/org/aion/db/impl/AbstractDB.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.db.impl;
 
 import java.io.File;
diff --git a/modDbImpl/src/org/aion/db/impl/DBVendor.java b/modDbImpl/src/org/aion/db/impl/DBVendor.java
index db85a4a4aa..0cfe04237b 100644
--- a/modDbImpl/src/org/aion/db/impl/DBVendor.java
+++ b/modDbImpl/src/org/aion/db/impl/DBVendor.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl;
 
 import java.util.List;
diff --git a/modDbImpl/src/org/aion/db/impl/DatabaseFactory.java b/modDbImpl/src/org/aion/db/impl/DatabaseFactory.java
index 67b8e6ab2e..3723c9af6b 100644
--- a/modDbImpl/src/org/aion/db/impl/DatabaseFactory.java
+++ b/modDbImpl/src/org/aion/db/impl/DatabaseFactory.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl;
 
 import java.util.Properties;
diff --git a/modDbImpl/src/org/aion/db/impl/IDriver.java b/modDbImpl/src/org/aion/db/impl/IDriver.java
index f0ba9f85ed..aa9affd809 100644
--- a/modDbImpl/src/org/aion/db/impl/IDriver.java
+++ b/modDbImpl/src/org/aion/db/impl/IDriver.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.db.impl;
 
 import org.aion.base.db.IByteArrayKeyValueDatabase;
diff --git a/modDbImpl/src/org/aion/db/impl/h2/H2MVMap.java b/modDbImpl/src/org/aion/db/impl/h2/H2MVMap.java
index c67003e1c8..48b1a00b47 100644
--- a/modDbImpl/src/org/aion/db/impl/h2/H2MVMap.java
+++ b/modDbImpl/src/org/aion/db/impl/h2/H2MVMap.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl.h2;
 
 import java.io.File;
diff --git a/modDbImpl/src/org/aion/db/impl/leveldb/LevelDB.java b/modDbImpl/src/org/aion/db/impl/leveldb/LevelDB.java
index ef00e1475f..854932f7c9 100644
--- a/modDbImpl/src/org/aion/db/impl/leveldb/LevelDB.java
+++ b/modDbImpl/src/org/aion/db/impl/leveldb/LevelDB.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl.leveldb;
 
 import java.io.File;
diff --git a/modDbImpl/src/org/aion/db/impl/leveldb/LevelDBConstants.java b/modDbImpl/src/org/aion/db/impl/leveldb/LevelDBConstants.java
index 8edca52906..786cb93715 100644
--- a/modDbImpl/src/org/aion/db/impl/leveldb/LevelDBConstants.java
+++ b/modDbImpl/src/org/aion/db/impl/leveldb/LevelDBConstants.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl.leveldb;
 
 /** Constants for LevelDB implementation, used as fallback when nothing else matches */
diff --git a/modDbImpl/src/org/aion/db/impl/mockdb/MockDB.java b/modDbImpl/src/org/aion/db/impl/mockdb/MockDB.java
index 0d6c96eea5..c47a234951 100644
--- a/modDbImpl/src/org/aion/db/impl/mockdb/MockDB.java
+++ b/modDbImpl/src/org/aion/db/impl/mockdb/MockDB.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl.mockdb;
 
 import java.util.Collection;
diff --git a/modDbImpl/src/org/aion/db/impl/mockdb/MockDBDriver.java b/modDbImpl/src/org/aion/db/impl/mockdb/MockDBDriver.java
index 09eab8b641..f30ee35321 100644
--- a/modDbImpl/src/org/aion/db/impl/mockdb/MockDBDriver.java
+++ b/modDbImpl/src/org/aion/db/impl/mockdb/MockDBDriver.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl.mockdb;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modDbImpl/src/org/aion/db/impl/mockdb/PersistentMockDB.java b/modDbImpl/src/org/aion/db/impl/mockdb/PersistentMockDB.java
index f7940822e8..8dc29804ac 100644
--- a/modDbImpl/src/org/aion/db/impl/mockdb/PersistentMockDB.java
+++ b/modDbImpl/src/org/aion/db/impl/mockdb/PersistentMockDB.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.db.impl.mockdb;
 
 import java.io.BufferedReader;
diff --git a/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBConstants.java b/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBConstants.java
index 59dcc305e1..f640355ed2 100644
--- a/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBConstants.java
+++ b/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBConstants.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl.rocksdb;
 
 public class RocksDBConstants {
diff --git a/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBWrapper.java b/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBWrapper.java
index e80eacfb6f..babda87595 100644
--- a/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBWrapper.java
+++ b/modDbImpl/src/org/aion/db/impl/rocksdb/RocksDBWrapper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.db.impl.rocksdb;
 
 import java.io.File;
diff --git a/modDbImpl/test/org/aion/db/impl/AccessWithExceptionTest.java b/modDbImpl/test/org/aion/db/impl/AccessWithExceptionTest.java
index 3c3bca8de0..932c78e6ad 100644
--- a/modDbImpl/test/org/aion/db/impl/AccessWithExceptionTest.java
+++ b/modDbImpl/test/org/aion/db/impl/AccessWithExceptionTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modDbImpl/test/org/aion/db/impl/ConcurrencyTest.java b/modDbImpl/test/org/aion/db/impl/ConcurrencyTest.java
index 6c949dcb7b..1826295ee1 100644
--- a/modDbImpl/test/org/aion/db/impl/ConcurrencyTest.java
+++ b/modDbImpl/test/org/aion/db/impl/ConcurrencyTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modDbImpl/test/org/aion/db/impl/DatabaseFactoryTest.java b/modDbImpl/test/org/aion/db/impl/DatabaseFactoryTest.java
index 1aaa4b8805..3148b54778 100644
--- a/modDbImpl/test/org/aion/db/impl/DatabaseFactoryTest.java
+++ b/modDbImpl/test/org/aion/db/impl/DatabaseFactoryTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modDbImpl/test/org/aion/db/impl/DatabaseTestUtils.java b/modDbImpl/test/org/aion/db/impl/DatabaseTestUtils.java
index 52b8e138b9..44e4f8f1fa 100644
--- a/modDbImpl/test/org/aion/db/impl/DatabaseTestUtils.java
+++ b/modDbImpl/test/org/aion/db/impl/DatabaseTestUtils.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modDbImpl/test/org/aion/db/impl/DriverBaseTest.java b/modDbImpl/test/org/aion/db/impl/DriverBaseTest.java
index 307bf376a6..fdff614cd3 100644
--- a/modDbImpl/test/org/aion/db/impl/DriverBaseTest.java
+++ b/modDbImpl/test/org/aion/db/impl/DriverBaseTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modDbImpl/test/org/aion/db/impl/DriverBenchmarkTest.java b/modDbImpl/test/org/aion/db/impl/DriverBenchmarkTest.java
index be8b6a175d..f58c4752ac 100644
--- a/modDbImpl/test/org/aion/db/impl/DriverBenchmarkTest.java
+++ b/modDbImpl/test/org/aion/db/impl/DriverBenchmarkTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group
- */
 package org.aion.db.impl;
 
 import static com.google.common.base.Charsets.UTF_8;
diff --git a/modDbImpl/test/org/aion/db/impl/h2/H2MVMapDriverTest.java b/modDbImpl/test/org/aion/db/impl/h2/H2MVMapDriverTest.java
index f91e4b66dd..e22236ef51 100644
--- a/modDbImpl/test/org/aion/db/impl/h2/H2MVMapDriverTest.java
+++ b/modDbImpl/test/org/aion/db/impl/h2/H2MVMapDriverTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl.h2;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modDbImpl/test/org/aion/db/impl/leveldb/LevelDBDriverTest.java b/modDbImpl/test/org/aion/db/impl/leveldb/LevelDBDriverTest.java
index 8e8c18cfd8..4f42a12ec1 100644
--- a/modDbImpl/test/org/aion/db/impl/leveldb/LevelDBDriverTest.java
+++ b/modDbImpl/test/org/aion/db/impl/leveldb/LevelDBDriverTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.db.impl.leveldb;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modDbImpl/test/org/aion/db/impl/mockdb/MockDBDriverTest.java b/modDbImpl/test/org/aion/db/impl/mockdb/MockDBDriverTest.java
index 0edd64936b..2919dd9a88 100644
--- a/modDbImpl/test/org/aion/db/impl/mockdb/MockDBDriverTest.java
+++ b/modDbImpl/test/org/aion/db/impl/mockdb/MockDBDriverTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.db.impl.mockdb;
 
 import static org.aion.db.impl.DatabaseFactory.Props.DB_NAME;
diff --git a/modDbImpl/test/org/aion/db/impl/rocksdb/RocksDBDriverTest.java b/modDbImpl/test/org/aion/db/impl/rocksdb/RocksDBDriverTest.java
index de0390cdff..d045056f21 100644
--- a/modDbImpl/test/org/aion/db/impl/rocksdb/RocksDBDriverTest.java
+++ b/modDbImpl/test/org/aion/db/impl/rocksdb/RocksDBDriverTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.db.impl.rocksdb;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modDbImpl/test/org/aion/db/utils/FileUtils.java b/modDbImpl/test/org/aion/db/utils/FileUtils.java
index a9d0191476..0651c3cd30 100644
--- a/modDbImpl/test/org/aion/db/utils/FileUtils.java
+++ b/modDbImpl/test/org/aion/db/utils/FileUtils.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils;
 
 import com.google.common.base.Preconditions;
diff --git a/modDbImpl/test/org/aion/db/utils/repeat/Repeat.java b/modDbImpl/test/org/aion/db/utils/repeat/Repeat.java
index ab54759ba4..2523373183 100644
--- a/modDbImpl/test/org/aion/db/utils/repeat/Repeat.java
+++ b/modDbImpl/test/org/aion/db/utils/repeat/Repeat.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.repeat;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
diff --git a/modDbImpl/test/org/aion/db/utils/repeat/RepeatRule.java b/modDbImpl/test/org/aion/db/utils/repeat/RepeatRule.java
index 833dff2a28..cc02abd1e6 100644
--- a/modDbImpl/test/org/aion/db/utils/repeat/RepeatRule.java
+++ b/modDbImpl/test/org/aion/db/utils/repeat/RepeatRule.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.repeat;
 
 import org.junit.rules.TestRule;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/BasicSliceOutput.java b/modDbImpl/test/org/aion/db/utils/slices/BasicSliceOutput.java
index a63d74f744..4329b77e74 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/BasicSliceOutput.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/BasicSliceOutput.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import java.io.IOException;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/SizeOf.java b/modDbImpl/test/org/aion/db/utils/slices/SizeOf.java
index 652ef67b22..6e060f9836 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/SizeOf.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/SizeOf.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 public final class SizeOf {
diff --git a/modDbImpl/test/org/aion/db/utils/slices/Slice.java b/modDbImpl/test/org/aion/db/utils/slices/Slice.java
index 5a3c6844d3..392497ab85 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/Slice.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/Slice.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/SliceComparator.java b/modDbImpl/test/org/aion/db/utils/slices/SliceComparator.java
index 6829490b79..2da235f56b 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/SliceComparator.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/SliceComparator.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import java.util.Comparator;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/SliceInput.java b/modDbImpl/test/org/aion/db/utils/slices/SliceInput.java
index 22ef9f0674..4b08369a93 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/SliceInput.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/SliceInput.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import java.io.DataInput;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/SliceOutput.java b/modDbImpl/test/org/aion/db/utils/slices/SliceOutput.java
index ec7777329f..b119179789 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/SliceOutput.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/SliceOutput.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import java.io.DataOutput;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/Slices.java b/modDbImpl/test/org/aion/db/utils/slices/Slices.java
index d14dbb1af2..d18bad7ac3 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/Slices.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/Slices.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import com.google.common.base.Preconditions;
diff --git a/modDbImpl/test/org/aion/db/utils/slices/VariableLengthQuantity.java b/modDbImpl/test/org/aion/db/utils/slices/VariableLengthQuantity.java
index b2ebe566f9..6770655554 100644
--- a/modDbImpl/test/org/aion/db/utils/slices/VariableLengthQuantity.java
+++ b/modDbImpl/test/org/aion/db/utils/slices/VariableLengthQuantity.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- *     H2 Group.
- */
 package org.aion.db.utils.slices;
 
 import java.nio.ByteBuffer;
diff --git a/modEvtMgr/src/org/aion/evtmgr/EventMgrModule.java b/modEvtMgr/src/org/aion/evtmgr/EventMgrModule.java
index ac8ae667e9..87be113467 100644
--- a/modEvtMgr/src/org/aion/evtmgr/EventMgrModule.java
+++ b/modEvtMgr/src/org/aion/evtmgr/EventMgrModule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 import java.util.Properties;
diff --git a/modEvtMgr/src/org/aion/evtmgr/IEvent.java b/modEvtMgr/src/org/aion/evtmgr/IEvent.java
index 28133adafc..fb7e3c1fb5 100644
--- a/modEvtMgr/src/org/aion/evtmgr/IEvent.java
+++ b/modEvtMgr/src/org/aion/evtmgr/IEvent.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 import java.util.List;
diff --git a/modEvtMgr/src/org/aion/evtmgr/IEventCallback.java b/modEvtMgr/src/org/aion/evtmgr/IEventCallback.java
index 623e42d587..a057446255 100644
--- a/modEvtMgr/src/org/aion/evtmgr/IEventCallback.java
+++ b/modEvtMgr/src/org/aion/evtmgr/IEventCallback.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 /** @author jay */
diff --git a/modEvtMgr/src/org/aion/evtmgr/IEventMgr.java b/modEvtMgr/src/org/aion/evtmgr/IEventMgr.java
index f82d2bc443..978a816f62 100644
--- a/modEvtMgr/src/org/aion/evtmgr/IEventMgr.java
+++ b/modEvtMgr/src/org/aion/evtmgr/IEventMgr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 import java.util.List;
diff --git a/modEvtMgr/src/org/aion/evtmgr/IHandler.java b/modEvtMgr/src/org/aion/evtmgr/IHandler.java
index 2184476a83..532f972a27 100644
--- a/modEvtMgr/src/org/aion/evtmgr/IHandler.java
+++ b/modEvtMgr/src/org/aion/evtmgr/IHandler.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 /** @author jay */
diff --git a/modEvtMgr/test/org/aion/evtmgr/EventMgrModuleTest.java b/modEvtMgr/test/org/aion/evtmgr/EventMgrModuleTest.java
index 7a399ecd0b..715bc4b3f2 100644
--- a/modEvtMgr/test/org/aion/evtmgr/EventMgrModuleTest.java
+++ b/modEvtMgr/test/org/aion/evtmgr/EventMgrModuleTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modEvtMgr/test/org/aion/evtmgr/InterfaceCoverageTest.java b/modEvtMgr/test/org/aion/evtmgr/InterfaceCoverageTest.java
index 64f00c0e41..23d434c834 100644
--- a/modEvtMgr/test/org/aion/evtmgr/InterfaceCoverageTest.java
+++ b/modEvtMgr/test/org/aion/evtmgr/InterfaceCoverageTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr;
 
 import org.aion.evtmgr.impl.evt.EventBlock;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEvent.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEvent.java
index ed43c3c661..68a01a596d 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEvent.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEvent.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.abs;
 
 import java.util.List;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEventMgr.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEventMgr.java
index 0dc4bb080b..34de6fc70e 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEventMgr.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractEventMgr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.abs;
 
 import java.util.ArrayList;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractHandler.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractHandler.java
index 997655408e..a994d8b822 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractHandler.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/abs/AbstractHandler.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.abs;
 
 import java.util.HashSet;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/callback/EventCallback.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/callback/EventCallback.java
index 4e5a5b874c..549a22587c 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/callback/EventCallback.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/callback/EventCallback.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.callback;
 
 import org.aion.evtmgr.IEvent;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/es/EventExecuteService.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/es/EventExecuteService.java
index c12fa0fcfb..249a886abe 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/es/EventExecuteService.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/es/EventExecuteService.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.evtmgr.impl.es;
 
 import java.util.HashSet;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventBlock.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventBlock.java
index d9ee34ce4d..ef65e3e25b 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventBlock.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventBlock.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import org.aion.evtmgr.IEvent;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventConsensus.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventConsensus.java
index b3ca1eccf7..cb73ce70cb 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventConsensus.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventConsensus.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import org.aion.evtmgr.IEvent;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventDummy.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventDummy.java
index a708f96987..690b985849 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventDummy.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventDummy.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import java.util.List;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventMiner.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventMiner.java
index 32041f085b..84c025737e 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventMiner.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventMiner.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import org.aion.evtmgr.IEvent;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventTx.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventTx.java
index 6381bef9c2..88f75dad1e 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventTx.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/evt/EventTx.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import org.aion.evtmgr.IEvent;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/BlockHandler.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/BlockHandler.java
index 487cbadf0d..aea91055c4 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/BlockHandler.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/BlockHandler.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.handler;
 
 import org.aion.evtmgr.IHandler;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/ConsensusHandler.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/ConsensusHandler.java
index 56f4359d2d..f1db1ed000 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/ConsensusHandler.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/ConsensusHandler.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.handler;
 
 import org.aion.evtmgr.IHandler;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/MinerHandler.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/MinerHandler.java
index 4cf6853a26..d3f9eea730 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/MinerHandler.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/MinerHandler.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.handler;
 
 import org.aion.evtmgr.IHandler;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/TxHandler.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/TxHandler.java
index 1708551501..4073926321 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/TxHandler.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/handler/TxHandler.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.handler;
 
 import org.aion.evtmgr.IHandler;
diff --git a/modEvtMgrImpl/src/org/aion/evtmgr/impl/mgr/EventMgrA0.java b/modEvtMgrImpl/src/org/aion/evtmgr/impl/mgr/EventMgrA0.java
index f7b0cb2019..d67cd7d27e 100644
--- a/modEvtMgrImpl/src/org/aion/evtmgr/impl/mgr/EventMgrA0.java
+++ b/modEvtMgrImpl/src/org/aion/evtmgr/impl/mgr/EventMgrA0.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.mgr;
 
 import java.util.List;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventMgrTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventMgrTest.java
index f279db42bb..4f572341ab 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventMgrTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventMgrTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.abs;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventTest.java
index 26f88c8e4c..deac902126 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractEventTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.abs;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractHandlerTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractHandlerTest.java
index 789317b289..d1bf5bd768 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractHandlerTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/abs/AbstractHandlerTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.abs;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/callback/EventCallbackTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/callback/EventCallbackTest.java
index 10d5393bd8..58e44a6d35 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/callback/EventCallbackTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/callback/EventCallbackTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.callback;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/es/EventExecuteServiceTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/es/EventExecuteServiceTest.java
index 175a42ecb6..921e506354 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/es/EventExecuteServiceTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/es/EventExecuteServiceTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.es;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventBlockTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventBlockTest.java
index 2df5717da1..25003de69c 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventBlockTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventBlockTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventConsensusTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventConsensusTest.java
index 477409e302..67fe92c63a 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventConsensusTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventConsensusTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventDummyTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventDummyTest.java
index 854960a535..905b068fb5 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventDummyTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventDummyTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventMinerTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventMinerTest.java
index 4ccf2783bb..0d9b51600c 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventMinerTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventMinerTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventTxTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventTxTest.java
index eca3162462..75b0caa9cc 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventTxTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/evt/EventTxTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.evt;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/handler/EventHandlersTest.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/handler/EventHandlersTest.java
index ddf9d597a5..23e97af2c9 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/handler/EventHandlersTest.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/handler/EventHandlersTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.handler;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modEvtMgrImpl/test/org/aion/evtmgr/impl/mgr/EventMgrA0Test.java b/modEvtMgrImpl/test/org/aion/evtmgr/impl/mgr/EventMgrA0Test.java
index 901dc121c4..42929993d8 100644
--- a/modEvtMgrImpl/test/org/aion/evtmgr/impl/mgr/EventMgrA0Test.java
+++ b/modEvtMgrImpl/test/org/aion/evtmgr/impl/mgr/EventMgrA0Test.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.evtmgr.impl.mgr;
 
 import static org.junit.Assert.assertFalse;
diff --git a/aion_gui.sh b/modGui/aion_gui.sh
similarity index 100%
rename from aion_gui.sh
rename to modGui/aion_gui.sh
diff --git a/modGui/build.gradle b/modGui/build.gradle
index ef3b936834..f3e69acff6 100644
--- a/modGui/build.gradle
+++ b/modGui/build.gradle
@@ -1,4 +1,3 @@
-
 ext.moduleName = 'aion.gui'
 test.dependsOn copyNativeLibsForModuleTests
 clean.dependsOn deleteNativeLibs
@@ -15,6 +14,7 @@ buildscript {
 apply plugin: 'com.google.osdetector'
 ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
 
+apply plugin: "de.undercouch.download" //version: '3.4.3'
 
 sourceSets {
     main {
@@ -30,7 +30,6 @@ sourceSets {
 }
 
 dependencies {
-
     compile project(':modLogger')
     compile project(':modMcf')
     compile project(':modAionImpl')
@@ -75,3 +74,36 @@ integTest {
     systemProperty "prism.order", "sw"
     systemProperty "prism.text", "t2k"
 }
+
+task fetchJavaFxRuntime(type: Download) { 
+    onlyIfModified
+    overwrite false
+    src "http://gluonhq.com/download/javafx-11-jmods-linux"
+    dest "${buildDir}/jfx/openjfx-11_linux-x64_bin-jmods.zip"
+}
+
+task unzipJavaFxRuntime(type: Copy) { 
+    dependsOn fetchJavaFxRuntime
+
+    def outDir = file("${buildDir}/pack");
+    from zipTree(fetchJavaFxRuntime.dest)
+    into outDir
+
+    rootProject.tasks['prePack'].configure { 
+        def jfxOutputDir = '/javafx-jmods-11' // the dir that Zip file is expected to extract to
+        environment "JAVAFX_PATH", outDir.canonicalPath + jfxOutputDir
+        environment "JAVAFX_MODULES", 
+            "javafx.graphics,javafx.controls,javafx.base,javafx.fxml,javafx.swing"
+    } 
+}
+
+task copyShellScripts(type: Copy) {
+    def aionGuiSh = file("aion_gui.sh");
+    rootProject.tasks['pack'].configure { 
+        from aionGuiSh into('/aion/') 
+    }
+}
+
+task setupAionRootProject {
+    dependsOn unzipJavaFxRuntime, copyShellScripts
+}
diff --git a/modLogger/src/org/aion/log/AionLoggerFactory.java b/modLogger/src/org/aion/log/AionLoggerFactory.java
index 5a0b608591..553d27be7d 100644
--- a/modLogger/src/org/aion/log/AionLoggerFactory.java
+++ b/modLogger/src/org/aion/log/AionLoggerFactory.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.log;
 
 import ch.qos.logback.classic.AsyncAppender;
diff --git a/modLogger/src/org/aion/log/LogEnum.java b/modLogger/src/org/aion/log/LogEnum.java
index d12adaabfb..c3274d7c54 100644
--- a/modLogger/src/org/aion/log/LogEnum.java
+++ b/modLogger/src/org/aion/log/LogEnum.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.log;
 
 /** Logger modules available to classes in the kernel */
diff --git a/modLogger/src/org/aion/log/LogLevel.java b/modLogger/src/org/aion/log/LogLevel.java
index 3f0db97611..912db47c3d 100644
--- a/modLogger/src/org/aion/log/LogLevel.java
+++ b/modLogger/src/org/aion/log/LogLevel.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.log;
 
 public enum LogLevel {
diff --git a/modLogger/src/org/aion/log/LogUtil.java b/modLogger/src/org/aion/log/LogUtil.java
index 78807e2897..ec343631c3 100644
--- a/modLogger/src/org/aion/log/LogUtil.java
+++ b/modLogger/src/org/aion/log/LogUtil.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.log;
 
 /**
diff --git a/modMcf/src/org/aion/mcf/account/Account.java b/modMcf/src/org/aion/mcf/account/Account.java
index 10ac3d6c8a..7be09aa0f4 100644
--- a/modMcf/src/org/aion/mcf/account/Account.java
+++ b/modMcf/src/org/aion/mcf/account/Account.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import org.aion.crypto.ECKey;
diff --git a/modMcf/src/org/aion/mcf/account/AccountManager.java b/modMcf/src/org/aion/mcf/account/AccountManager.java
index 4cde61f9be..3931157a24 100644
--- a/modMcf/src/org/aion/mcf/account/AccountManager.java
+++ b/modMcf/src/org/aion/mcf/account/AccountManager.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.account;
 
 import java.time.Instant;
diff --git a/modMcf/src/org/aion/mcf/account/CipherParams.java b/modMcf/src/org/aion/mcf/account/CipherParams.java
index bf57782e1e..57c73c1bee 100644
--- a/modMcf/src/org/aion/mcf/account/CipherParams.java
+++ b/modMcf/src/org/aion/mcf/account/CipherParams.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import java.io.UnsupportedEncodingException;
diff --git a/modMcf/src/org/aion/mcf/account/FileDateTimeComparator.java b/modMcf/src/org/aion/mcf/account/FileDateTimeComparator.java
index 2a90974b2f..f356b21092 100644
--- a/modMcf/src/org/aion/mcf/account/FileDateTimeComparator.java
+++ b/modMcf/src/org/aion/mcf/account/FileDateTimeComparator.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import java.io.File;
diff --git a/modMcf/src/org/aion/mcf/account/KdfParams.java b/modMcf/src/org/aion/mcf/account/KdfParams.java
index ae004d3b7b..495a606890 100644
--- a/modMcf/src/org/aion/mcf/account/KdfParams.java
+++ b/modMcf/src/org/aion/mcf/account/KdfParams.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import java.io.UnsupportedEncodingException;
diff --git a/modMcf/src/org/aion/mcf/account/Keystore.java b/modMcf/src/org/aion/mcf/account/Keystore.java
index eb82805433..84f37d0d1c 100644
--- a/modMcf/src/org/aion/mcf/account/Keystore.java
+++ b/modMcf/src/org/aion/mcf/account/Keystore.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.mcf.account;
 
 import java.io.File;
diff --git a/modMcf/src/org/aion/mcf/account/KeystoreCrypto.java b/modMcf/src/org/aion/mcf/account/KeystoreCrypto.java
index 4a73733d6a..8b421a204c 100644
--- a/modMcf/src/org/aion/mcf/account/KeystoreCrypto.java
+++ b/modMcf/src/org/aion/mcf/account/KeystoreCrypto.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import java.io.UnsupportedEncodingException;
diff --git a/modMcf/src/org/aion/mcf/account/KeystoreFormat.java b/modMcf/src/org/aion/mcf/account/KeystoreFormat.java
index e573d574bd..cabd511baa 100644
--- a/modMcf/src/org/aion/mcf/account/KeystoreFormat.java
+++ b/modMcf/src/org/aion/mcf/account/KeystoreFormat.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import java.security.GeneralSecurityException;
diff --git a/modMcf/src/org/aion/mcf/account/KeystoreItem.java b/modMcf/src/org/aion/mcf/account/KeystoreItem.java
index 6d1774b85a..0dbf67090b 100644
--- a/modMcf/src/org/aion/mcf/account/KeystoreItem.java
+++ b/modMcf/src/org/aion/mcf/account/KeystoreItem.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import java.io.UnsupportedEncodingException;
diff --git a/modMcf/src/org/aion/mcf/blockchain/AbstractPendingTx.java b/modMcf/src/org/aion/mcf/blockchain/AbstractPendingTx.java
index 300c01eab0..3652db6dcb 100644
--- a/modMcf/src/org/aion/mcf/blockchain/AbstractPendingTx.java
+++ b/modMcf/src/org/aion/mcf/blockchain/AbstractPendingTx.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/blockchain/AbstractSyncQueue.java b/modMcf/src/org/aion/mcf/blockchain/AbstractSyncQueue.java
index f345db7e2a..c480c284db 100644
--- a/modMcf/src/org/aion/mcf/blockchain/AbstractSyncQueue.java
+++ b/modMcf/src/org/aion/mcf/blockchain/AbstractSyncQueue.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.util.ArrayList;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IBlockConstants.java b/modMcf/src/org/aion/mcf/blockchain/IBlockConstants.java
index c1203967e1..59602fbc01 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IBlockConstants.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IBlockConstants.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IChainCfg.java b/modMcf/src/org/aion/mcf/blockchain/IChainCfg.java
index 56f2b766e3..3980ba2c6e 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IChainCfg.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IChainCfg.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import org.aion.base.type.IBlock;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IChainInstanceBase.java b/modMcf/src/org/aion/mcf/blockchain/IChainInstanceBase.java
index c2ba3283c5..ae14c6c205 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IChainInstanceBase.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IChainInstanceBase.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 /** Chain instance base interface. */
diff --git a/modMcf/src/org/aion/mcf/blockchain/IChainInstancePOW.java b/modMcf/src/org/aion/mcf/blockchain/IChainInstancePOW.java
index 7119628b4c..1c740b6ae3 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IChainInstancePOW.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IChainInstancePOW.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import org.aion.mcf.mine.IMineRunner;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IGenericChain.java b/modMcf/src/org/aion/mcf/blockchain/IGenericChain.java
index 0200d3f2cf..80ab76dd03 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IGenericChain.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IGenericChain.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import org.aion.base.type.IBlock;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IPendingState.java b/modMcf/src/org/aion/mcf/blockchain/IPendingState.java
index eb356c19fb..d0e789018d 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IPendingState.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IPendingState.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IPendingStateInternal.java b/modMcf/src/org/aion/mcf/blockchain/IPendingStateInternal.java
index 1c98595059..a6f2706944 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IPendingStateInternal.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IPendingStateInternal.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/blockchain/IPowChain.java b/modMcf/src/org/aion/mcf/blockchain/IPowChain.java
index d7e91ff789..1823772308 100644
--- a/modMcf/src/org/aion/mcf/blockchain/IPowChain.java
+++ b/modMcf/src/org/aion/mcf/blockchain/IPowChain.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/blockchain/ISyncQueue.java b/modMcf/src/org/aion/mcf/blockchain/ISyncQueue.java
index b2712199cf..10106d73ca 100644
--- a/modMcf/src/org/aion/mcf/blockchain/ISyncQueue.java
+++ b/modMcf/src/org/aion/mcf/blockchain/ISyncQueue.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import java.util.Collection;
diff --git a/modMcf/src/org/aion/mcf/blockchain/TxExecutorBase.java b/modMcf/src/org/aion/mcf/blockchain/TxExecutorBase.java
index 7066f71cbb..9212efa872 100644
--- a/modMcf/src/org/aion/mcf/blockchain/TxExecutorBase.java
+++ b/modMcf/src/org/aion/mcf/blockchain/TxExecutorBase.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.blockchain;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modMcf/src/org/aion/mcf/blockchain/TxResponse.java b/modMcf/src/org/aion/mcf/blockchain/TxResponse.java
index 13840ba831..a9b9da2ab4 100644
--- a/modMcf/src/org/aion/mcf/blockchain/TxResponse.java
+++ b/modMcf/src/org/aion/mcf/blockchain/TxResponse.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.blockchain;
 
 public enum TxResponse {
diff --git a/modMcf/src/org/aion/mcf/blockchain/valid/AbstractValidRule.java b/modMcf/src/org/aion/mcf/blockchain/valid/AbstractValidRule.java
index 080241926c..d807d4bedb 100644
--- a/modMcf/src/org/aion/mcf/blockchain/valid/AbstractValidRule.java
+++ b/modMcf/src/org/aion/mcf/blockchain/valid/AbstractValidRule.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.blockchain.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/blockchain/valid/BlockHeaderRule.java b/modMcf/src/org/aion/mcf/blockchain/valid/BlockHeaderRule.java
index a0b98ee54f..c8d77985e4 100644
--- a/modMcf/src/org/aion/mcf/blockchain/valid/BlockHeaderRule.java
+++ b/modMcf/src/org/aion/mcf/blockchain/valid/BlockHeaderRule.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.blockchain.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/blockchain/valid/IBlockHeaderValidRule.java b/modMcf/src/org/aion/mcf/blockchain/valid/IBlockHeaderValidRule.java
index f18c381bde..9e27122fec 100644
--- a/modMcf/src/org/aion/mcf/blockchain/valid/IBlockHeaderValidRule.java
+++ b/modMcf/src/org/aion/mcf/blockchain/valid/IBlockHeaderValidRule.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.blockchain.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/blockchain/valid/IValidRule.java b/modMcf/src/org/aion/mcf/blockchain/valid/IValidRule.java
index 8f7197fd56..4ab54834a5 100644
--- a/modMcf/src/org/aion/mcf/blockchain/valid/IValidRule.java
+++ b/modMcf/src/org/aion/mcf/blockchain/valid/IValidRule.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.blockchain.valid;
 
 /** Valication rules interface. */
diff --git a/modMcf/src/org/aion/mcf/config/Cfg.java b/modMcf/src/org/aion/mcf/config/Cfg.java
index d01a9c9a99..0cf67e4312 100644
--- a/modMcf/src/org/aion/mcf/config/Cfg.java
+++ b/modMcf/src/org/aion/mcf/config/Cfg.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
diff --git a/modMcf/src/org/aion/mcf/config/CfgApi.java b/modMcf/src/org/aion/mcf/config/CfgApi.java
index 2964dba0bf..f9cfc0d016 100644
--- a/modMcf/src/org/aion/mcf/config/CfgApi.java
+++ b/modMcf/src/org/aion/mcf/config/CfgApi.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgApiNrg.java b/modMcf/src/org/aion/mcf/config/CfgApiNrg.java
index ebe7002cdd..402e3ca81e 100644
--- a/modMcf/src/org/aion/mcf/config/CfgApiNrg.java
+++ b/modMcf/src/org/aion/mcf/config/CfgApiNrg.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgApiRpc.java b/modMcf/src/org/aion/mcf/config/CfgApiRpc.java
index 72cb140f7c..418f5e113d 100644
--- a/modMcf/src/org/aion/mcf/config/CfgApiRpc.java
+++ b/modMcf/src/org/aion/mcf/config/CfgApiRpc.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import java.io.IOException;
diff --git a/modMcf/src/org/aion/mcf/config/CfgApiZmq.java b/modMcf/src/org/aion/mcf/config/CfgApiZmq.java
index 54e32b2fec..54ca33bc64 100644
--- a/modMcf/src/org/aion/mcf/config/CfgApiZmq.java
+++ b/modMcf/src/org/aion/mcf/config/CfgApiZmq.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgConsensus.java b/modMcf/src/org/aion/mcf/config/CfgConsensus.java
index ca5227b112..53642b092f 100644
--- a/modMcf/src/org/aion/mcf/config/CfgConsensus.java
+++ b/modMcf/src/org/aion/mcf/config/CfgConsensus.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import javax.xml.stream.XMLStreamException;
diff --git a/modMcf/src/org/aion/mcf/config/CfgDb.java b/modMcf/src/org/aion/mcf/config/CfgDb.java
index acc2b729b2..8ec5d6796f 100644
--- a/modMcf/src/org/aion/mcf/config/CfgDb.java
+++ b/modMcf/src/org/aion/mcf/config/CfgDb.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modMcf/src/org/aion/mcf/config/CfgDbDetails.java b/modMcf/src/org/aion/mcf/config/CfgDbDetails.java
index db8993090c..e83a2c98bf 100644
--- a/modMcf/src/org/aion/mcf/config/CfgDbDetails.java
+++ b/modMcf/src/org/aion/mcf/config/CfgDbDetails.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modMcf/src/org/aion/mcf/config/CfgFork.java b/modMcf/src/org/aion/mcf/config/CfgFork.java
index fbca022a83..9ce6ee5637 100644
--- a/modMcf/src/org/aion/mcf/config/CfgFork.java
+++ b/modMcf/src/org/aion/mcf/config/CfgFork.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import java.util.Properties;
diff --git a/modMcf/src/org/aion/mcf/config/CfgGui.java b/modMcf/src/org/aion/mcf/config/CfgGui.java
index 86115b6363..988ca7b11b 100644
--- a/modMcf/src/org/aion/mcf/config/CfgGui.java
+++ b/modMcf/src/org/aion/mcf/config/CfgGui.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgGuiLauncher.java b/modMcf/src/org/aion/mcf/config/CfgGuiLauncher.java
index f53b5a8ac5..5be756a895 100644
--- a/modMcf/src/org/aion/mcf/config/CfgGuiLauncher.java
+++ b/modMcf/src/org/aion/mcf/config/CfgGuiLauncher.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgLog.java b/modMcf/src/org/aion/mcf/config/CfgLog.java
index ef18b65557..aacdcde957 100644
--- a/modMcf/src/org/aion/mcf/config/CfgLog.java
+++ b/modMcf/src/org/aion/mcf/config/CfgLog.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgNet.java b/modMcf/src/org/aion/mcf/config/CfgNet.java
index 92f260add1..117872aabd 100644
--- a/modMcf/src/org/aion/mcf/config/CfgNet.java
+++ b/modMcf/src/org/aion/mcf/config/CfgNet.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgNetP2p.java b/modMcf/src/org/aion/mcf/config/CfgNetP2p.java
index 07fccd8578..c36210ded9 100644
--- a/modMcf/src/org/aion/mcf/config/CfgNetP2p.java
+++ b/modMcf/src/org/aion/mcf/config/CfgNetP2p.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgPrune.java b/modMcf/src/org/aion/mcf/config/CfgPrune.java
index 7af898da7e..2feea01177 100644
--- a/modMcf/src/org/aion/mcf/config/CfgPrune.java
+++ b/modMcf/src/org/aion/mcf/config/CfgPrune.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgReports.java b/modMcf/src/org/aion/mcf/config/CfgReports.java
index ff019cbaf2..4f9a83a06d 100644
--- a/modMcf/src/org/aion/mcf/config/CfgReports.java
+++ b/modMcf/src/org/aion/mcf/config/CfgReports.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgSsl.java b/modMcf/src/org/aion/mcf/config/CfgSsl.java
index 3083d34615..a7a6f71d47 100644
--- a/modMcf/src/org/aion/mcf/config/CfgSsl.java
+++ b/modMcf/src/org/aion/mcf/config/CfgSsl.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import java.io.IOException;
diff --git a/modMcf/src/org/aion/mcf/config/CfgSync.java b/modMcf/src/org/aion/mcf/config/CfgSync.java
index 7d7f47cefb..48d8a81c49 100644
--- a/modMcf/src/org/aion/mcf/config/CfgSync.java
+++ b/modMcf/src/org/aion/mcf/config/CfgSync.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/CfgTx.java b/modMcf/src/org/aion/mcf/config/CfgTx.java
index fcfa825e87..b49d336012 100644
--- a/modMcf/src/org/aion/mcf/config/CfgTx.java
+++ b/modMcf/src/org/aion/mcf/config/CfgTx.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import com.google.common.base.Objects;
diff --git a/modMcf/src/org/aion/mcf/config/StatsType.java b/modMcf/src/org/aion/mcf/config/StatsType.java
index d02754713e..45cfd56e7a 100644
--- a/modMcf/src/org/aion/mcf/config/StatsType.java
+++ b/modMcf/src/org/aion/mcf/config/StatsType.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import java.util.Arrays;
diff --git a/modMcf/src/org/aion/mcf/core/AbstractState.java b/modMcf/src/org/aion/mcf/core/AbstractState.java
index 643eb321c2..714fd0efdb 100644
--- a/modMcf/src/org/aion/mcf/core/AbstractState.java
+++ b/modMcf/src/org/aion/mcf/core/AbstractState.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 /**
diff --git a/modMcf/src/org/aion/mcf/core/AbstractTxInfo.java b/modMcf/src/org/aion/mcf/core/AbstractTxInfo.java
index 65a5f329f4..32d315abc2 100644
--- a/modMcf/src/org/aion/mcf/core/AbstractTxInfo.java
+++ b/modMcf/src/org/aion/mcf/core/AbstractTxInfo.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 import org.aion.mcf.types.AbstractTransaction;
diff --git a/modMcf/src/org/aion/mcf/core/AccountState.java b/modMcf/src/org/aion/mcf/core/AccountState.java
index 306f2cb66b..673fc0c73c 100644
--- a/modMcf/src/org/aion/mcf/core/AccountState.java
+++ b/modMcf/src/org/aion/mcf/core/AccountState.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 import static org.aion.crypto.HashUtil.EMPTY_DATA_HASH;
diff --git a/modMcf/src/org/aion/mcf/core/IBlockchain.java b/modMcf/src/org/aion/mcf/core/IBlockchain.java
index 8877347b4c..cb0b597558 100644
--- a/modMcf/src/org/aion/mcf/core/IBlockchain.java
+++ b/modMcf/src/org/aion/mcf/core/IBlockchain.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/core/IDifficultyCalculator.java b/modMcf/src/org/aion/mcf/core/IDifficultyCalculator.java
index 3658c77214..2e05380245 100644
--- a/modMcf/src/org/aion/mcf/core/IDifficultyCalculator.java
+++ b/modMcf/src/org/aion/mcf/core/IDifficultyCalculator.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/core/IRewardsCalculator.java b/modMcf/src/org/aion/mcf/core/IRewardsCalculator.java
index 0ee31b9ec7..33a5fb8bc0 100644
--- a/modMcf/src/org/aion/mcf/core/IRewardsCalculator.java
+++ b/modMcf/src/org/aion/mcf/core/IRewardsCalculator.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/core/ImportResult.java b/modMcf/src/org/aion/mcf/core/ImportResult.java
index df810a8a67..099bd8188f 100644
--- a/modMcf/src/org/aion/mcf/core/ImportResult.java
+++ b/modMcf/src/org/aion/mcf/core/ImportResult.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 /** Import Result Enum */
diff --git a/modMcf/src/org/aion/mcf/core/TxTouchedStorage.java b/modMcf/src/org/aion/mcf/core/TxTouchedStorage.java
index 5e9459023e..cd51900621 100644
--- a/modMcf/src/org/aion/mcf/core/TxTouchedStorage.java
+++ b/modMcf/src/org/aion/mcf/core/TxTouchedStorage.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.core;
 
 import java.util.Collection;
diff --git a/modMcf/src/org/aion/mcf/db/AbstractContractDetails.java b/modMcf/src/org/aion/mcf/db/AbstractContractDetails.java
index 7515786c4f..c53513e65b 100644
--- a/modMcf/src/org/aion/mcf/db/AbstractContractDetails.java
+++ b/modMcf/src/org/aion/mcf/db/AbstractContractDetails.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modMcf/src/org/aion/mcf/db/AbstractPowBlockstore.java b/modMcf/src/org/aion/mcf/db/AbstractPowBlockstore.java
index fbf12ce44d..6389ae80e5 100644
--- a/modMcf/src/org/aion/mcf/db/AbstractPowBlockstore.java
+++ b/modMcf/src/org/aion/mcf/db/AbstractPowBlockstore.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import org.aion.mcf.types.AbstractBlock;
diff --git a/modMcf/src/org/aion/mcf/db/AbstractRepository.java b/modMcf/src/org/aion/mcf/db/AbstractRepository.java
index a20bfdd090..b1ad09b917 100644
--- a/modMcf/src/org/aion/mcf/db/AbstractRepository.java
+++ b/modMcf/src/org/aion/mcf/db/AbstractRepository.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import static org.aion.db.impl.DatabaseFactory.Props;
diff --git a/modMcf/src/org/aion/mcf/db/AbstractRepositoryCache.java b/modMcf/src/org/aion/mcf/db/AbstractRepositoryCache.java
index ec9921d0cf..363e6a5eb5 100644
--- a/modMcf/src/org/aion/mcf/db/AbstractRepositoryCache.java
+++ b/modMcf/src/org/aion/mcf/db/AbstractRepositoryCache.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modMcf/src/org/aion/mcf/db/ContractDetailsCacheImpl.java b/modMcf/src/org/aion/mcf/db/ContractDetailsCacheImpl.java
index 0cb67c7d56..c888689888 100644
--- a/modMcf/src/org/aion/mcf/db/ContractDetailsCacheImpl.java
+++ b/modMcf/src/org/aion/mcf/db/ContractDetailsCacheImpl.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import java.util.Collection;
diff --git a/modMcf/src/org/aion/mcf/db/DatabaseUtils.java b/modMcf/src/org/aion/mcf/db/DatabaseUtils.java
index 1847207614..ce6f211278 100644
--- a/modMcf/src/org/aion/mcf/db/DatabaseUtils.java
+++ b/modMcf/src/org/aion/mcf/db/DatabaseUtils.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import java.io.File;
diff --git a/modMcf/src/org/aion/mcf/db/DetailsDataStore.java b/modMcf/src/org/aion/mcf/db/DetailsDataStore.java
index e9816f59fa..9f3e813e21 100644
--- a/modMcf/src/org/aion/mcf/db/DetailsDataStore.java
+++ b/modMcf/src/org/aion/mcf/db/DetailsDataStore.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.db;
 
 import static org.aion.base.util.ByteArrayWrapper.wrap;
diff --git a/modMcf/src/org/aion/mcf/db/IBlockStoreBase.java b/modMcf/src/org/aion/mcf/db/IBlockStoreBase.java
index 3071aabb0f..6f9070f115 100644
--- a/modMcf/src/org/aion/mcf/db/IBlockStoreBase.java
+++ b/modMcf/src/org/aion/mcf/db/IBlockStoreBase.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/db/IBlockStorePow.java b/modMcf/src/org/aion/mcf/db/IBlockStorePow.java
index fca5aa3775..21111701df 100644
--- a/modMcf/src/org/aion/mcf/db/IBlockStorePow.java
+++ b/modMcf/src/org/aion/mcf/db/IBlockStorePow.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/db/TransactionStore.java b/modMcf/src/org/aion/mcf/db/TransactionStore.java
index 1ccc3ada7e..1a7184dcb6 100644
--- a/modMcf/src/org/aion/mcf/db/TransactionStore.java
+++ b/modMcf/src/org/aion/mcf/db/TransactionStore.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.db;
 
 import static org.aion.base.util.Utils.dummy;
diff --git a/modMcf/src/org/aion/mcf/db/exception/DBSetExistsException.java b/modMcf/src/org/aion/mcf/db/exception/DBSetExistsException.java
index 5110793959..b1876af99b 100644
--- a/modMcf/src/org/aion/mcf/db/exception/DBSetExistsException.java
+++ b/modMcf/src/org/aion/mcf/db/exception/DBSetExistsException.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db.exception;
 
 /** DBSet exist exception. */
diff --git a/modMcf/src/org/aion/mcf/db/exception/InvalidFilePathException.java b/modMcf/src/org/aion/mcf/db/exception/InvalidFilePathException.java
index 136259ffd2..fa3891a674 100644
--- a/modMcf/src/org/aion/mcf/db/exception/InvalidFilePathException.java
+++ b/modMcf/src/org/aion/mcf/db/exception/InvalidFilePathException.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db.exception;
 
 /** Invalid file path exception. */
diff --git a/modMcf/src/org/aion/mcf/ds/ArchivedDataSource.java b/modMcf/src/org/aion/mcf/ds/ArchivedDataSource.java
index d83b13bbfc..6289187659 100644
--- a/modMcf/src/org/aion/mcf/ds/ArchivedDataSource.java
+++ b/modMcf/src/org/aion/mcf/ds/ArchivedDataSource.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.ds;
 
 import java.util.Collection;
diff --git a/modMcf/src/org/aion/mcf/ds/CachedSource.java b/modMcf/src/org/aion/mcf/ds/CachedSource.java
index 7dbf936026..d55240aeec 100644
--- a/modMcf/src/org/aion/mcf/ds/CachedSource.java
+++ b/modMcf/src/org/aion/mcf/ds/CachedSource.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.ds;
 
 import java.util.Collection;
diff --git a/modMcf/src/org/aion/mcf/ds/DataSourceArray.java b/modMcf/src/org/aion/mcf/ds/DataSourceArray.java
index 5111c1bea8..2ab199754e 100644
--- a/modMcf/src/org/aion/mcf/ds/DataSourceArray.java
+++ b/modMcf/src/org/aion/mcf/ds/DataSourceArray.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.ds;
 
 import java.io.Closeable;
diff --git a/modMcf/src/org/aion/mcf/ds/ObjectDataSource.java b/modMcf/src/org/aion/mcf/ds/ObjectDataSource.java
index 069303aaf0..afb4da56c5 100644
--- a/modMcf/src/org/aion/mcf/ds/ObjectDataSource.java
+++ b/modMcf/src/org/aion/mcf/ds/ObjectDataSource.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.ds;
 
 import java.io.Closeable;
diff --git a/modMcf/src/org/aion/mcf/ds/Serializer.java b/modMcf/src/org/aion/mcf/ds/Serializer.java
index 13aa64ce0b..35f8787bf2 100644
--- a/modMcf/src/org/aion/mcf/ds/Serializer.java
+++ b/modMcf/src/org/aion/mcf/ds/Serializer.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.ds;
 
 /**
diff --git a/modMcf/src/org/aion/mcf/ds/Source.java b/modMcf/src/org/aion/mcf/ds/Source.java
index 0ee43ecc6d..b89fcb750a 100644
--- a/modMcf/src/org/aion/mcf/ds/Source.java
+++ b/modMcf/src/org/aion/mcf/ds/Source.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.mcf.ds;
 
 /**
diff --git a/modMcf/src/org/aion/mcf/ds/XorDataSource.java b/modMcf/src/org/aion/mcf/ds/XorDataSource.java
index 4526259a09..128ca27964 100644
--- a/modMcf/src/org/aion/mcf/ds/XorDataSource.java
+++ b/modMcf/src/org/aion/mcf/ds/XorDataSource.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.ds;
 
 import java.util.Collection;
diff --git a/modMcf/src/org/aion/mcf/evt/EventHub.java b/modMcf/src/org/aion/mcf/evt/EventHub.java
index 4f62e3985a..67740ccc54 100644
--- a/modMcf/src/org/aion/mcf/evt/EventHub.java
+++ b/modMcf/src/org/aion/mcf/evt/EventHub.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.evt;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/evt/EvtCb.java b/modMcf/src/org/aion/mcf/evt/EvtCb.java
index fb02cf0a48..8c59f84d3d 100644
--- a/modMcf/src/org/aion/mcf/evt/EvtCb.java
+++ b/modMcf/src/org/aion/mcf/evt/EvtCb.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.evt;
 
 @FunctionalInterface
diff --git a/modMcf/src/org/aion/mcf/evt/EvtData.java b/modMcf/src/org/aion/mcf/evt/EvtData.java
index 0356b1c64c..e89e81d1dc 100644
--- a/modMcf/src/org/aion/mcf/evt/EvtData.java
+++ b/modMcf/src/org/aion/mcf/evt/EvtData.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.evt;
 
 /** @author jin */
diff --git a/modMcf/src/org/aion/mcf/evt/IListenerBase.java b/modMcf/src/org/aion/mcf/evt/IListenerBase.java
index 1b7d93c16c..d6955489bd 100644
--- a/modMcf/src/org/aion/mcf/evt/IListenerBase.java
+++ b/modMcf/src/org/aion/mcf/evt/IListenerBase.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.evt;
 
 import org.aion.base.type.IBlock;
diff --git a/modMcf/src/org/aion/mcf/evt/IPowListener.java b/modMcf/src/org/aion/mcf/evt/IPowListener.java
index 0b1b758bf2..0e0952b6f2 100644
--- a/modMcf/src/org/aion/mcf/evt/IPowListener.java
+++ b/modMcf/src/org/aion/mcf/evt/IPowListener.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.evt;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/manager/ChainStatistics.java b/modMcf/src/org/aion/mcf/manager/ChainStatistics.java
index c8db41064e..5d3562f77f 100644
--- a/modMcf/src/org/aion/mcf/manager/ChainStatistics.java
+++ b/modMcf/src/org/aion/mcf/manager/ChainStatistics.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.manager;
 
 import java.util.LinkedList;
diff --git a/modMcf/src/org/aion/mcf/mine/AbstractMineRunner.java b/modMcf/src/org/aion/mcf/mine/AbstractMineRunner.java
index d7e91d7d24..84eddbe0dc 100644
--- a/modMcf/src/org/aion/mcf/mine/AbstractMineRunner.java
+++ b/modMcf/src/org/aion/mcf/mine/AbstractMineRunner.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.mine;
 
 import org.aion.base.type.IBlock;
diff --git a/modMcf/src/org/aion/mcf/mine/IMineRunner.java b/modMcf/src/org/aion/mcf/mine/IMineRunner.java
index 77cf13a0e5..07197d3cb7 100644
--- a/modMcf/src/org/aion/mcf/mine/IMineRunner.java
+++ b/modMcf/src/org/aion/mcf/mine/IMineRunner.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.mine;
 
 public interface IMineRunner {
diff --git a/modMcf/src/org/aion/mcf/mine/IMiner.java b/modMcf/src/org/aion/mcf/mine/IMiner.java
index 6e7080bf9c..09e9481353 100644
--- a/modMcf/src/org/aion/mcf/mine/IMiner.java
+++ b/modMcf/src/org/aion/mcf/mine/IMiner.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.mine;
 
 import com.google.common.util.concurrent.ListenableFuture;
diff --git a/modMcf/src/org/aion/mcf/mine/IMinerListener.java b/modMcf/src/org/aion/mcf/mine/IMinerListener.java
index 3875c5f5e3..77eccc3e0f 100644
--- a/modMcf/src/org/aion/mcf/mine/IMinerListener.java
+++ b/modMcf/src/org/aion/mcf/mine/IMinerListener.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.mine;
 
 import org.aion.base.type.IBlock;
diff --git a/modMcf/src/org/aion/mcf/mine/MiningThreadFactory.java b/modMcf/src/org/aion/mcf/mine/MiningThreadFactory.java
index bac1ab2476..266079d9c5 100644
--- a/modMcf/src/org/aion/mcf/mine/MiningThreadFactory.java
+++ b/modMcf/src/org/aion/mcf/mine/MiningThreadFactory.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.mine;
 
 import java.util.concurrent.ThreadFactory;
diff --git a/modMcf/src/org/aion/mcf/serial/SerialHeaderValue.java b/modMcf/src/org/aion/mcf/serial/SerialHeaderValue.java
index bcd6ef1739..7c7c24fc3d 100644
--- a/modMcf/src/org/aion/mcf/serial/SerialHeaderValue.java
+++ b/modMcf/src/org/aion/mcf/serial/SerialHeaderValue.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.serial;
 
 /**
diff --git a/modMcf/src/org/aion/mcf/trie/Cache.java b/modMcf/src/org/aion/mcf/trie/Cache.java
index 42a4286a35..07b048da7d 100644
--- a/modMcf/src/org/aion/mcf/trie/Cache.java
+++ b/modMcf/src/org/aion/mcf/trie/Cache.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie;
 
 import static org.aion.base.util.ByteArrayWrapper.wrap;
diff --git a/modMcf/src/org/aion/mcf/trie/JournalPruneDataSource.java b/modMcf/src/org/aion/mcf/trie/JournalPruneDataSource.java
index 4463bae7d5..ad41eda6fb 100644
--- a/modMcf/src/org/aion/mcf/trie/JournalPruneDataSource.java
+++ b/modMcf/src/org/aion/mcf/trie/JournalPruneDataSource.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie;
 
 import java.util.ArrayList;
diff --git a/modMcf/src/org/aion/mcf/trie/Node.java b/modMcf/src/org/aion/mcf/trie/Node.java
index 363adefba8..0d3d99d0af 100644
--- a/modMcf/src/org/aion/mcf/trie/Node.java
+++ b/modMcf/src/org/aion/mcf/trie/Node.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.mcf.trie;
 
 import org.aion.rlp.Value;
diff --git a/modMcf/src/org/aion/mcf/trie/SecureTrie.java b/modMcf/src/org/aion/mcf/trie/SecureTrie.java
index ef12efa29d..414000ce78 100644
--- a/modMcf/src/org/aion/mcf/trie/SecureTrie.java
+++ b/modMcf/src/org/aion/mcf/trie/SecureTrie.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.mcf.trie;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modMcf/src/org/aion/mcf/trie/Trie.java b/modMcf/src/org/aion/mcf/trie/Trie.java
index 1f6f3effd9..6201e4d528 100644
--- a/modMcf/src/org/aion/mcf/trie/Trie.java
+++ b/modMcf/src/org/aion/mcf/trie/Trie.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie;
 
 import org.aion.base.db.IByteArrayKeyValueDatabase;
diff --git a/modMcf/src/org/aion/mcf/trie/TrieImpl.java b/modMcf/src/org/aion/mcf/trie/TrieImpl.java
index 2756a94ffc..5d28ad18d5 100644
--- a/modMcf/src/org/aion/mcf/trie/TrieImpl.java
+++ b/modMcf/src/org/aion/mcf/trie/TrieImpl.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.mcf.trie;
 
 import static java.util.Arrays.copyOfRange;
diff --git a/modMcf/src/org/aion/mcf/trie/TrieIterator.java b/modMcf/src/org/aion/mcf/trie/TrieIterator.java
index a977261237..e869ae202e 100644
--- a/modMcf/src/org/aion/mcf/trie/TrieIterator.java
+++ b/modMcf/src/org/aion/mcf/trie/TrieIterator.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie;
 
 import static org.aion.rlp.CompactEncoder.unpackToNibbles;
diff --git a/modMcf/src/org/aion/mcf/trie/scan/CollectFullSetOfNodes.java b/modMcf/src/org/aion/mcf/trie/scan/CollectFullSetOfNodes.java
index 2db13a2a60..bb30c7d11d 100644
--- a/modMcf/src/org/aion/mcf/trie/scan/CollectFullSetOfNodes.java
+++ b/modMcf/src/org/aion/mcf/trie/scan/CollectFullSetOfNodes.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie.scan;
 
 import java.util.HashSet;
diff --git a/modMcf/src/org/aion/mcf/trie/scan/CountNodes.java b/modMcf/src/org/aion/mcf/trie/scan/CountNodes.java
index 969982a191..4428294049 100644
--- a/modMcf/src/org/aion/mcf/trie/scan/CountNodes.java
+++ b/modMcf/src/org/aion/mcf/trie/scan/CountNodes.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie.scan;
 
 import org.aion.rlp.Value;
diff --git a/modMcf/src/org/aion/mcf/trie/scan/ExtractToDatabase.java b/modMcf/src/org/aion/mcf/trie/scan/ExtractToDatabase.java
index 68dd0f6bfd..e4e023cdaf 100644
--- a/modMcf/src/org/aion/mcf/trie/scan/ExtractToDatabase.java
+++ b/modMcf/src/org/aion/mcf/trie/scan/ExtractToDatabase.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.trie.scan;
 
 import org.aion.base.db.IByteArrayKeyValueDatabase;
diff --git a/modMcf/src/org/aion/mcf/trie/scan/ScanAction.java b/modMcf/src/org/aion/mcf/trie/scan/ScanAction.java
index 390d136c4a..a37ad2d398 100644
--- a/modMcf/src/org/aion/mcf/trie/scan/ScanAction.java
+++ b/modMcf/src/org/aion/mcf/trie/scan/ScanAction.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie.scan;
 
 import org.aion.rlp.Value;
diff --git a/modMcf/src/org/aion/mcf/trie/scan/TraceAllNodes.java b/modMcf/src/org/aion/mcf/trie/scan/TraceAllNodes.java
index 024e7b8d97..4f9f19af99 100644
--- a/modMcf/src/org/aion/mcf/trie/scan/TraceAllNodes.java
+++ b/modMcf/src/org/aion/mcf/trie/scan/TraceAllNodes.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.mcf.trie.scan;
 
 import org.aion.base.util.Hex;
diff --git a/modMcf/src/org/aion/mcf/tx/AbstractTxTask.java b/modMcf/src/org/aion/mcf/tx/AbstractTxTask.java
index ea5dc097e1..09884276e9 100644
--- a/modMcf/src/org/aion/mcf/tx/AbstractTxTask.java
+++ b/modMcf/src/org/aion/mcf/tx/AbstractTxTask.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.tx;
 
 import java.util.Collections;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractBlock.java b/modMcf/src/org/aion/mcf/types/AbstractBlock.java
index e759441483..4e9290e75c 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractBlock.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractBlock.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import java.util.ArrayList;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractBlockHeader.java b/modMcf/src/org/aion/mcf/types/AbstractBlockHeader.java
index fcb2ec9267..7628619e02 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractBlockHeader.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractBlockHeader.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractBlockHeaderWrapper.java b/modMcf/src/org/aion/mcf/types/AbstractBlockHeaderWrapper.java
index b4f075142d..d6c5d31120 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractBlockHeaderWrapper.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractBlockHeaderWrapper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import java.util.Arrays;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractBlockSummary.java b/modMcf/src/org/aion/mcf/types/AbstractBlockSummary.java
index f3fac4c75b..516f3fc5a6 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractBlockSummary.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractBlockSummary.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractBlockWrapper.java b/modMcf/src/org/aion/mcf/types/AbstractBlockWrapper.java
index 5cd2d90de4..91e3d2394b 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractBlockWrapper.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractBlockWrapper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import static org.aion.base.util.TimeUtils.secondsToMillis;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractTransaction.java b/modMcf/src/org/aion/mcf/types/AbstractTransaction.java
index 62b14c2249..826699fba0 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractTransaction.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractTransaction.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/types/AbstractTxReceipt.java b/modMcf/src/org/aion/mcf/types/AbstractTxReceipt.java
index bbc77482e7..278ff802db 100644
--- a/modMcf/src/org/aion/mcf/types/AbstractTxReceipt.java
+++ b/modMcf/src/org/aion/mcf/types/AbstractTxReceipt.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.types;
 
 import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
diff --git a/modMcf/src/org/aion/mcf/types/BlockIdentifier.java b/modMcf/src/org/aion/mcf/types/BlockIdentifier.java
index 884ce88077..d87081df8c 100644
--- a/modMcf/src/org/aion/mcf/types/BlockIdentifier.java
+++ b/modMcf/src/org/aion/mcf/types/BlockIdentifier.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.types;
 
 import static org.aion.base.util.ByteUtil.byteArrayToLong;
diff --git a/modMcf/src/org/aion/mcf/valid/AbstractBlockHeaderValidator.java b/modMcf/src/org/aion/mcf/valid/AbstractBlockHeaderValidator.java
index 5a37bb1bc0..1e07c06c3c 100644
--- a/modMcf/src/org/aion/mcf/valid/AbstractBlockHeaderValidator.java
+++ b/modMcf/src/org/aion/mcf/valid/AbstractBlockHeaderValidator.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/valid/BlockHeaderValidator.java b/modMcf/src/org/aion/mcf/valid/BlockHeaderValidator.java
index e5eeb3892c..fd5e867906 100644
--- a/modMcf/src/org/aion/mcf/valid/BlockHeaderValidator.java
+++ b/modMcf/src/org/aion/mcf/valid/BlockHeaderValidator.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.valid;
 
 import java.util.LinkedList;
diff --git a/modMcf/src/org/aion/mcf/valid/BlockNumberRule.java b/modMcf/src/org/aion/mcf/valid/BlockNumberRule.java
index 293db7d2d2..1ec8d38250 100644
--- a/modMcf/src/org/aion/mcf/valid/BlockNumberRule.java
+++ b/modMcf/src/org/aion/mcf/valid/BlockNumberRule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/valid/DependentBlockHeaderRule.java b/modMcf/src/org/aion/mcf/valid/DependentBlockHeaderRule.java
index de6a4d27c7..72d1a72c11 100644
--- a/modMcf/src/org/aion/mcf/valid/DependentBlockHeaderRule.java
+++ b/modMcf/src/org/aion/mcf/valid/DependentBlockHeaderRule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/valid/GrandParentBlockHeaderValidator.java b/modMcf/src/org/aion/mcf/valid/GrandParentBlockHeaderValidator.java
index 330c1ee5ef..7989ce08d7 100644
--- a/modMcf/src/org/aion/mcf/valid/GrandParentBlockHeaderValidator.java
+++ b/modMcf/src/org/aion/mcf/valid/GrandParentBlockHeaderValidator.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.valid;
 
 import java.util.LinkedList;
diff --git a/modMcf/src/org/aion/mcf/valid/GrandParentDependantBlockHeaderRule.java b/modMcf/src/org/aion/mcf/valid/GrandParentDependantBlockHeaderRule.java
index 926a8f94d5..217bd038cd 100644
--- a/modMcf/src/org/aion/mcf/valid/GrandParentDependantBlockHeaderRule.java
+++ b/modMcf/src/org/aion/mcf/valid/GrandParentDependantBlockHeaderRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/valid/ParentBlockHeaderValidator.java b/modMcf/src/org/aion/mcf/valid/ParentBlockHeaderValidator.java
index fd1e89fcac..9a6bb4a3a7 100644
--- a/modMcf/src/org/aion/mcf/valid/ParentBlockHeaderValidator.java
+++ b/modMcf/src/org/aion/mcf/valid/ParentBlockHeaderValidator.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.valid;
 
 import java.util.LinkedList;
diff --git a/modMcf/src/org/aion/mcf/valid/TimeStampRule.java b/modMcf/src/org/aion/mcf/valid/TimeStampRule.java
index 3a55f6f50d..f70c685fbe 100644
--- a/modMcf/src/org/aion/mcf/valid/TimeStampRule.java
+++ b/modMcf/src/org/aion/mcf/valid/TimeStampRule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.valid;
 
 import java.util.List;
diff --git a/modMcf/src/org/aion/mcf/valid/TxNrgRule.java b/modMcf/src/org/aion/mcf/valid/TxNrgRule.java
index 0f1d3774e8..a51323df82 100644
--- a/modMcf/src/org/aion/mcf/valid/TxNrgRule.java
+++ b/modMcf/src/org/aion/mcf/valid/TxNrgRule.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.valid;
 
 import org.aion.mcf.vm.Constants;
diff --git a/modMcf/src/org/aion/mcf/vm/Constants.java b/modMcf/src/org/aion/mcf/vm/Constants.java
index 36222091ea..3b28538ab6 100644
--- a/modMcf/src/org/aion/mcf/vm/Constants.java
+++ b/modMcf/src/org/aion/mcf/vm/Constants.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.vm;
 
 /**
diff --git a/modMcf/src/org/aion/mcf/vm/types/Bloom.java b/modMcf/src/org/aion/mcf/vm/types/Bloom.java
index b546e1649b..6790be6310 100644
--- a/modMcf/src/org/aion/mcf/vm/types/Bloom.java
+++ b/modMcf/src/org/aion/mcf/vm/types/Bloom.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.vm.types;
 
 import java.util.Arrays;
diff --git a/modMcf/src/org/aion/mcf/vm/types/DataWord.java b/modMcf/src/org/aion/mcf/vm/types/DataWord.java
index f7b281a8f5..139cfacaaf 100644
--- a/modMcf/src/org/aion/mcf/vm/types/DataWord.java
+++ b/modMcf/src/org/aion/mcf/vm/types/DataWord.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.vm.types;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/vm/types/DoubleDataWord.java b/modMcf/src/org/aion/mcf/vm/types/DoubleDataWord.java
index 1d3ebfabcf..c32141ce2d 100644
--- a/modMcf/src/org/aion/mcf/vm/types/DoubleDataWord.java
+++ b/modMcf/src/org/aion/mcf/vm/types/DoubleDataWord.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.vm.types;
 
 import java.math.BigInteger;
diff --git a/modMcf/src/org/aion/mcf/vm/types/Log.java b/modMcf/src/org/aion/mcf/vm/types/Log.java
index df3ce90afc..71ddb1962a 100644
--- a/modMcf/src/org/aion/mcf/vm/types/Log.java
+++ b/modMcf/src/org/aion/mcf/vm/types/Log.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.vm.types;
 
 import java.util.ArrayList;
diff --git a/modMcf/test/org/aion/mcf/account/AccountManagerTest.java b/modMcf/test/org/aion/mcf/account/AccountManagerTest.java
index 67fcd7bdd1..ab218ea6e9 100644
--- a/modMcf/test/org/aion/mcf/account/AccountManagerTest.java
+++ b/modMcf/test/org/aion/mcf/account/AccountManagerTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/aion/mcf/account/AccountTest.java b/modMcf/test/org/aion/mcf/account/AccountTest.java
index 6df3d7e18b..fbe306c52e 100644
--- a/modMcf/test/org/aion/mcf/account/AccountTest.java
+++ b/modMcf/test/org/aion/mcf/account/AccountTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.account;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modMcf/test/org/aion/mcf/account/FileDateTimeComparatorTest.java b/modMcf/test/org/aion/mcf/account/FileDateTimeComparatorTest.java
index 2f3cb24302..139845c0e3 100644
--- a/modMcf/test/org/aion/mcf/account/FileDateTimeComparatorTest.java
+++ b/modMcf/test/org/aion/mcf/account/FileDateTimeComparatorTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import static org.hamcrest.Matchers.equalTo;
diff --git a/modMcf/test/org/aion/mcf/account/KeystoreTest.java b/modMcf/test/org/aion/mcf/account/KeystoreTest.java
index deb263a93a..0d4ce8db3b 100644
--- a/modMcf/test/org/aion/mcf/account/KeystoreTest.java
+++ b/modMcf/test/org/aion/mcf/account/KeystoreTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.account;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modMcf/test/org/aion/mcf/config/CfgForkTest.java b/modMcf/test/org/aion/mcf/config/CfgForkTest.java
index aafad250d2..bd734a9f98 100644
--- a/modMcf/test/org/aion/mcf/config/CfgForkTest.java
+++ b/modMcf/test/org/aion/mcf/config/CfgForkTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modMcf/test/org/aion/mcf/config/CfgGuiLauncherTest.java b/modMcf/test/org/aion/mcf/config/CfgGuiLauncherTest.java
index 539ee6f241..cbb31b2438 100644
--- a/modMcf/test/org/aion/mcf/config/CfgGuiLauncherTest.java
+++ b/modMcf/test/org/aion/mcf/config/CfgGuiLauncherTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import static org.hamcrest.Matchers.is;
diff --git a/modMcf/test/org/aion/mcf/config/CfgGuiTest.java b/modMcf/test/org/aion/mcf/config/CfgGuiTest.java
index 30c2bbccca..578cdfd5e1 100644
--- a/modMcf/test/org/aion/mcf/config/CfgGuiTest.java
+++ b/modMcf/test/org/aion/mcf/config/CfgGuiTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.config;
 
 import static org.hamcrest.Matchers.is;
diff --git a/modMcf/test/org/aion/mcf/config/CfgLogTest.java b/modMcf/test/org/aion/mcf/config/CfgLogTest.java
index 68d7274ae9..cd94b2dc5e 100644
--- a/modMcf/test/org/aion/mcf/config/CfgLogTest.java
+++ b/modMcf/test/org/aion/mcf/config/CfgLogTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.config;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modMcf/test/org/aion/mcf/db/AionRepositoryCacheTest.java b/modMcf/test/org/aion/mcf/db/AionRepositoryCacheTest.java
index d8861bc43b..0b8074f1e5 100644
--- a/modMcf/test/org/aion/mcf/db/AionRepositoryCacheTest.java
+++ b/modMcf/test/org/aion/mcf/db/AionRepositoryCacheTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modMcf/test/org/aion/mcf/db/IContractDetailsTest.java b/modMcf/test/org/aion/mcf/db/IContractDetailsTest.java
index 6232033f91..bedf9f2422 100644
--- a/modMcf/test/org/aion/mcf/db/IContractDetailsTest.java
+++ b/modMcf/test/org/aion/mcf/db/IContractDetailsTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.db;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modMcf/test/org/aion/mcf/ds/DataSourceArrayTest.java b/modMcf/test/org/aion/mcf/ds/DataSourceArrayTest.java
index b505406138..02fe15fb76 100644
--- a/modMcf/test/org/aion/mcf/ds/DataSourceArrayTest.java
+++ b/modMcf/test/org/aion/mcf/ds/DataSourceArrayTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.mcf.ds;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/aion/mcf/trie/JournalPruneDataSourceTest.java b/modMcf/test/org/aion/mcf/trie/JournalPruneDataSourceTest.java
index ca516300c3..6ec4e50b64 100644
--- a/modMcf/test/org/aion/mcf/trie/JournalPruneDataSourceTest.java
+++ b/modMcf/test/org/aion/mcf/trie/JournalPruneDataSourceTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.mcf.trie;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/aion/trie/TrieTest.java b/modMcf/test/org/aion/trie/TrieTest.java
index 46b25a3ee9..a479cf1ddc 100644
--- a/modMcf/test/org/aion/trie/TrieTest.java
+++ b/modMcf/test/org/aion/trie/TrieTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.trie;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/aion/trie/TrieTestWithRootHashValues.java b/modMcf/test/org/aion/trie/TrieTestWithRootHashValues.java
index cf7a1e9dd9..40facd50d5 100644
--- a/modMcf/test/org/aion/trie/TrieTestWithRootHashValues.java
+++ b/modMcf/test/org/aion/trie/TrieTestWithRootHashValues.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.trie;
 
 import static org.aion.crypto.HashUtil.EMPTY_TRIE_HASH;
diff --git a/modMcf/test/org/aion/valid/BlockNumberRuleTest.java b/modMcf/test/org/aion/valid/BlockNumberRuleTest.java
index 65b693d5a8..9bdab60de7 100644
--- a/modMcf/test/org/aion/valid/BlockNumberRuleTest.java
+++ b/modMcf/test/org/aion/valid/BlockNumberRuleTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/aion/valid/DifficultyRuleTest.java b/modMcf/test/org/aion/valid/DifficultyRuleTest.java
index 6bc4163ae5..21315e3a31 100644
--- a/modMcf/test/org/aion/valid/DifficultyRuleTest.java
+++ b/modMcf/test/org/aion/valid/DifficultyRuleTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/aion/valid/TimeStampRuleTest.java b/modMcf/test/org/aion/valid/TimeStampRuleTest.java
index 9162947110..c317f04a8b 100644
--- a/modMcf/test/org/aion/valid/TimeStampRuleTest.java
+++ b/modMcf/test/org/aion/valid/TimeStampRuleTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.valid;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modMcf/test/org/slf4j/impl/AionLoggerFactoryTest.java b/modMcf/test/org/slf4j/impl/AionLoggerFactoryTest.java
index 76a163f48b..8b101a69ba 100644
--- a/modMcf/test/org/slf4j/impl/AionLoggerFactoryTest.java
+++ b/modMcf/test/org/slf4j/impl/AionLoggerFactoryTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.slf4j.impl;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modP2p/build.gradle b/modP2p/build.gradle
index a00521bf23..d5d964cb3a 100644
--- a/modP2p/build.gradle
+++ b/modP2p/build.gradle
@@ -1,8 +1,6 @@
 ext.moduleName = 'aion.p2p'
 
 dependencies {
-    compile project(':modAionBase')
-
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-core:1.3'
 }
diff --git a/modP2p/src/module-info.java b/modP2p/src/module-info.java
index 449654ebac..166f0b775b 100644
--- a/modP2p/src/module-info.java
+++ b/modP2p/src/module-info.java
@@ -1,5 +1,3 @@
 module aion.p2p {
-    requires aion.base;
-
     exports org.aion.p2p;
 }
diff --git a/modP2p/src/org/aion/p2p/Ctrl.java b/modP2p/src/org/aion/p2p/Ctrl.java
index a64bb0c98b..fd4fa54e6f 100644
--- a/modP2p/src/org/aion/p2p/Ctrl.java
+++ b/modP2p/src/org/aion/p2p/Ctrl.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import java.util.HashSet;
diff --git a/modP2p/src/org/aion/p2p/Handler.java b/modP2p/src/org/aion/p2p/Handler.java
index 10ab3853aa..272e101bda 100644
--- a/modP2p/src/org/aion/p2p/Handler.java
+++ b/modP2p/src/org/aion/p2p/Handler.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 /** @author chris */
diff --git a/modP2p/src/org/aion/p2p/Header.java b/modP2p/src/org/aion/p2p/Header.java
index 802ff56bf0..aae680ed6a 100644
--- a/modP2p/src/org/aion/p2p/Header.java
+++ b/modP2p/src/org/aion/p2p/Header.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import java.nio.ByteBuffer;
diff --git a/modP2p/src/org/aion/p2p/INode.java b/modP2p/src/org/aion/p2p/INode.java
index 2649e2d008..9198914f84 100644
--- a/modP2p/src/org/aion/p2p/INode.java
+++ b/modP2p/src/org/aion/p2p/INode.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import java.math.BigInteger;
diff --git a/modP2p/src/org/aion/p2p/INodeMgr.java b/modP2p/src/org/aion/p2p/INodeMgr.java
index c1c2c4d466..2173c8a085 100644
--- a/modP2p/src/org/aion/p2p/INodeMgr.java
+++ b/modP2p/src/org/aion/p2p/INodeMgr.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import java.util.List;
diff --git a/modP2p/src/org/aion/p2p/IP2pMgr.java b/modP2p/src/org/aion/p2p/IP2pMgr.java
index f90b8591dc..7e2610dbb2 100644
--- a/modP2p/src/org/aion/p2p/IP2pMgr.java
+++ b/modP2p/src/org/aion/p2p/IP2pMgr.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import java.io.IOException;
diff --git a/modP2p/src/org/aion/p2p/IPeerMetric.java b/modP2p/src/org/aion/p2p/IPeerMetric.java
index 7553cd7178..44b05e8caa 100644
--- a/modP2p/src/org/aion/p2p/IPeerMetric.java
+++ b/modP2p/src/org/aion/p2p/IPeerMetric.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 /** An interface for tracking peer connection and banning metrics. */
diff --git a/modP2p/src/org/aion/p2p/Msg.java b/modP2p/src/org/aion/p2p/Msg.java
index 638fb3f29b..eebf2932a0 100644
--- a/modP2p/src/org/aion/p2p/Msg.java
+++ b/modP2p/src/org/aion/p2p/Msg.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 /** @author chris */
diff --git a/modP2p/src/org/aion/p2p/P2pConstant.java b/modP2p/src/org/aion/p2p/P2pConstant.java
index 6984074cd4..8e85a63259 100644
--- a/modP2p/src/org/aion/p2p/P2pConstant.java
+++ b/modP2p/src/org/aion/p2p/P2pConstant.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 public class P2pConstant {
diff --git a/modP2p/src/org/aion/p2p/Ver.java b/modP2p/src/org/aion/p2p/Ver.java
index 9c5f74e6f5..ae402f9238 100644
--- a/modP2p/src/org/aion/p2p/Ver.java
+++ b/modP2p/src/org/aion/p2p/Ver.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import java.util.HashSet;
diff --git a/modP2p/test/org/aion/p2p/CtrlTest.java b/modP2p/test/org/aion/p2p/CtrlTest.java
index f6e61d21d9..e5e7456a61 100644
--- a/modP2p/test/org/aion/p2p/CtrlTest.java
+++ b/modP2p/test/org/aion/p2p/CtrlTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2p/test/org/aion/p2p/HandlerTest.java b/modP2p/test/org/aion/p2p/HandlerTest.java
index ea7e0eecb2..cb8b8d44bd 100644
--- a/modP2p/test/org/aion/p2p/HandlerTest.java
+++ b/modP2p/test/org/aion/p2p/HandlerTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2p/test/org/aion/p2p/HeaderTest.java b/modP2p/test/org/aion/p2p/HeaderTest.java
index 83a5b4a265..b0911471ab 100644
--- a/modP2p/test/org/aion/p2p/HeaderTest.java
+++ b/modP2p/test/org/aion/p2p/HeaderTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2p/test/org/aion/p2p/MsgTest.java b/modP2p/test/org/aion/p2p/MsgTest.java
index 399c018716..4e32dfba31 100644
--- a/modP2p/test/org/aion/p2p/MsgTest.java
+++ b/modP2p/test/org/aion/p2p/MsgTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2p/test/org/aion/p2p/VerTest.java b/modP2p/test/org/aion/p2p/VerTest.java
index a1eaf8a733..181289b22e 100644
--- a/modP2p/test/org/aion/p2p/VerTest.java
+++ b/modP2p/test/org/aion/p2p/VerTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p;
 
 import static org.junit.Assert.assertEquals;
@@ -43,7 +20,7 @@ public void testFilter() {
         /*
          * inactive versions
          */
-        byte b1 = (byte) ThreadLocalRandom.current().nextInt(2, Short.MAX_VALUE);
+        byte b1 = (byte) ThreadLocalRandom.current().nextInt(2, Byte.MAX_VALUE);
         assertEquals(Ver.UNKNOWN, Ver.filter(b1));
     }
 }
diff --git a/modP2pImpl/build.gradle b/modP2pImpl/build.gradle
index 38295e399d..336add7c50 100644
--- a/modP2pImpl/build.gradle
+++ b/modP2pImpl/build.gradle
@@ -9,7 +9,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':modAionBase')
+    compile project(':modUtil')
     compile project(':modP2p')
     compile project(':modLogger')
     compile files('../lib/miniupnpc_linux.jar')
diff --git a/modP2pImpl/src/module-info.java b/modP2pImpl/src/module-info.java
index 89ff00cdd3..e82b9ef43e 100644
--- a/modP2pImpl/src/module-info.java
+++ b/modP2pImpl/src/module-info.java
@@ -1,6 +1,6 @@
 module aion.p2p.impl {
     requires aion.p2p;
-    requires aion.base;
+    requires aion.util;
     requires aion.log;
     requires miniupnpc.linux;
     requires slf4j.api;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/TaskRequestActiveNodes.java b/modP2pImpl/src/org/aion/p2p/impl/TaskRequestActiveNodes.java
index 940358287f..015f18f853 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/TaskRequestActiveNodes.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/TaskRequestActiveNodes.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import org.aion.p2p.INode;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/TaskUPnPManager.java b/modP2pImpl/src/org/aion/p2p/impl/TaskUPnPManager.java
index 78b5d6e998..5c0de7dadf 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/TaskUPnPManager.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/TaskUPnPManager.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/comm/Act.java b/modP2pImpl/src/org/aion/p2p/impl/comm/Act.java
index 22b7c3c697..d431f3d3b5 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/comm/Act.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/comm/Act.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import java.util.HashSet;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/comm/ChannelBuffer.java b/modP2pImpl/src/org/aion/p2p/impl/comm/ChannelBuffer.java
index 5a4bcf16e0..ef6fe707e3 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/comm/ChannelBuffer.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/comm/ChannelBuffer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import java.nio.ByteBuffer;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/comm/Node.java b/modP2pImpl/src/org/aion/p2p/impl/comm/Node.java
index e29cf0d386..506f5ad52c 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/comm/Node.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/comm/Node.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import java.math.BigInteger;
@@ -28,9 +5,9 @@
 import java.nio.channels.SocketChannel;
 import java.util.Arrays;
 import java.util.regex.Pattern;
-import org.aion.base.util.ByteUtil;
 import org.aion.p2p.INode;
 import org.aion.p2p.IPeerMetric;
+import org.aion.util.bytes.ByteUtil;
 
 /**
  * @author Chris p2p://{node-id}@{ip}:{port} node-id could be any non-empty string update to 36
diff --git a/modP2pImpl/src/org/aion/p2p/impl/comm/NodeMgr.java b/modP2pImpl/src/org/aion/p2p/impl/comm/NodeMgr.java
index ae70596ff1..0be36e78a1 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/comm/NodeMgr.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/comm/NodeMgr.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import java.security.SecureRandom;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/comm/PeerMetric.java b/modP2pImpl/src/org/aion/p2p/impl/comm/PeerMetric.java
index 25bfbcc414..812a0aadea 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/comm/PeerMetric.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/comm/PeerMetric.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import org.aion.p2p.IPeerMetric;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/one/msg/Hello.java b/modP2pImpl/src/org/aion/p2p/impl/one/msg/Hello.java
index 7ea27c18bf..89844f598c 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/one/msg/Hello.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/one/msg/Hello.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.one.msg;
 
 import java.io.UnsupportedEncodingException;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqActiveNodes.java b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqActiveNodes.java
index 3198b50cde..cbce894553 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqActiveNodes.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqActiveNodes.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import org.aion.p2p.Ctrl;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake.java b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake.java
index 8759e2b9cb..fafaa4d4f3 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import java.nio.ByteBuffer;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake1.java b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake1.java
index 6ea6703f3e..4b8e151c39 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake1.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ReqHandshake1.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResActiveNodes.java b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResActiveNodes.java
index 357727fdd7..037c49b3e3 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResActiveNodes.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResActiveNodes.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.p2p.impl.zero.msg;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake.java b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake.java
index 9770e9575a..64d014f0e1 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import org.aion.p2p.Ctrl;
diff --git a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake1.java b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake1.java
index 32b74f0a91..122d7ba352 100644
--- a/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake1.java
+++ b/modP2pImpl/src/org/aion/p2p/impl/zero/msg/ResHandshake1.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/P2pException.java b/modP2pImpl/src/org/aion/p2p/impl1/P2pException.java
index 017138fa94..0b8a0b3663 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/P2pException.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/P2pException.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1;
 
 import java.io.IOException;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/P2pMgr.java b/modP2pImpl/src/org/aion/p2p/impl1/P2pMgr.java
index 8d76f6a09c..d8c6ba3623 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/P2pMgr.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/P2pMgr.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.p2p.impl1;
 
 import java.io.BufferedReader;
@@ -189,11 +167,23 @@ public void run() {
              * Bigger RECV_BUFFER and BACKLOG can have a better socket read/write tolerance, can be a advanced p2p settings in the config file.
              */
             tcpServer.socket().setReceiveBufferSize(SOCKET_RECV_BUFFER);
-            tcpServer
-                    .socket()
-                    .bind(
-                            new InetSocketAddress(Node.ipBytesToStr(selfIp), selfPort),
-                            SOCKET_BACKLOG);
+
+            try {
+                tcpServer
+                        .socket()
+                        .bind(
+                                new InetSocketAddress(Node.ipBytesToStr(selfIp), selfPort),
+                                SOCKET_BACKLOG);
+            } catch (IOException e) {
+                p2pLOG.error(
+                        "Failed to connect to Socket Address: "
+                                + Node.ipBytesToStr(selfIp)
+                                + ":"
+                                + selfPort
+                                + ", please check your ip and port configration!",
+                        e);
+            }
+
             tcpServer.register(selector, SelectionKey.OP_ACCEPT);
 
             Thread thrdIn = new Thread(getInboundInstance(), "p2p-in");
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/ChannelBuffer.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/ChannelBuffer.java
index e714b4933e..fd1ecf0948 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/ChannelBuffer.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/ChannelBuffer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgIn.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgIn.java
index ae59551a0f..8e38c8d43c 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgIn.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgIn.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 /** An incoming message. */
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgOut.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgOut.java
index a6ca9fa17f..46cabb614e 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgOut.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/MsgOut.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import org.aion.p2p.Msg;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskClear.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskClear.java
index 8361e76c21..375e0b130e 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskClear.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskClear.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskConnectPeers.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskConnectPeers.java
index da71cb2fd9..849fc19e7b 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskConnectPeers.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskConnectPeers.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskInbound.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskInbound.java
index 01346f20dd..e0fc773a93 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskInbound.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskInbound.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskReceive.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskReceive.java
index ebe9fc274a..6c7ac20480 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskReceive.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskReceive.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskSend.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskSend.java
index 5ee90e57da..9c94c9d2f3 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskSend.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskSend.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskStatus.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskStatus.java
index 288a17bd4d..920a3ad3f6 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskStatus.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskStatus.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskWrite.java b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskWrite.java
index 2e721abf9a..03103e4e26 100644
--- a/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskWrite.java
+++ b/modP2pImpl/src/org/aion/p2p/impl1/tasks/TaskWrite.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/src/org/aion/p2p/impl2/TaskWrite.java b/modP2pImpl/src/org/aion/p2p/impl2/TaskWrite.java
index d4f78ae0e1..d6dec445f2 100644
--- a/modP2pImpl/src/org/aion/p2p/impl2/TaskWrite.java
+++ b/modP2pImpl/src/org/aion/p2p/impl2/TaskWrite.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl2;
 
 import java.nio.ByteBuffer;
diff --git a/modP2pImpl/src/org/aion/p2p/impl2/selector/IOEventBus.java b/modP2pImpl/src/org/aion/p2p/impl2/selector/IOEventBus.java
index de08e3e038..44df3e79ee 100644
--- a/modP2pImpl/src/org/aion/p2p/impl2/selector/IOEventBus.java
+++ b/modP2pImpl/src/org/aion/p2p/impl2/selector/IOEventBus.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl2.selector;
 
 import java.util.LinkedList;
diff --git a/modP2pImpl/src/org/aion/p2p/impl2/selector/MainIOLoop.java b/modP2pImpl/src/org/aion/p2p/impl2/selector/MainIOLoop.java
index a54d40abd7..f56a3e807d 100644
--- a/modP2pImpl/src/org/aion/p2p/impl2/selector/MainIOLoop.java
+++ b/modP2pImpl/src/org/aion/p2p/impl2/selector/MainIOLoop.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl2.selector;
 
 import java.io.IOException;
diff --git a/modP2pImpl/src/org/aion/p2p/impl2/selector/SelectorPool.java b/modP2pImpl/src/org/aion/p2p/impl2/selector/SelectorPool.java
index 6923ab049b..2dd2aba359 100644
--- a/modP2pImpl/src/org/aion/p2p/impl2/selector/SelectorPool.java
+++ b/modP2pImpl/src/org/aion/p2p/impl2/selector/SelectorPool.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl2.selector;
 
 /** Implementation to hold */
diff --git a/modP2pImpl/src/org/aion/p2p/impl2/selector/Task.java b/modP2pImpl/src/org/aion/p2p/impl2/selector/Task.java
index 848d148340..d83758ab33 100644
--- a/modP2pImpl/src/org/aion/p2p/impl2/selector/Task.java
+++ b/modP2pImpl/src/org/aion/p2p/impl2/selector/Task.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl2.selector;
 
 import java.nio.ByteBuffer;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/LastThousands.java b/modP2pImpl/test/org/aion/p2p/impl/LastThousands.java
index 1cb3837d77..5bc2e6ad84 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/LastThousands.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/LastThousands.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/P2pMgrTest.java b/modP2pImpl/test/org/aion/p2p/impl/P2pMgrTest.java
index 5465ee8ab5..202ba55640 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/P2pMgrTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/P2pMgrTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/TaskRequestActiveNodesTest.java b/modP2pImpl/test/org/aion/p2p/impl/TaskRequestActiveNodesTest.java
index cd32143753..aab3e10180 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/TaskRequestActiveNodesTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/TaskRequestActiveNodesTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/TempListTest.java b/modP2pImpl/test/org/aion/p2p/impl/TempListTest.java
index f3aeee70ba..15b3a5c96c 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/TempListTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/TempListTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/Test.java b/modP2pImpl/test/org/aion/p2p/impl/Test.java
index b3acaad74d..406ed863f7 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/Test.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/Test.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import static junit.framework.TestCase.assertTrue;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/TestUtilities.java b/modP2pImpl/test/org/aion/p2p/impl/TestUtilities.java
index f2f8c81321..40dcd506ac 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/TestUtilities.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/TestUtilities.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl;
 
 import java.io.IOException;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/comm/ActTest.java b/modP2pImpl/test/org/aion/p2p/impl/comm/ActTest.java
index 064cda6708..d6fa155a7d 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/comm/ActTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/comm/ActTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/comm/NodeMgrTest.java b/modP2pImpl/test/org/aion/p2p/impl/comm/NodeMgrTest.java
index 37ba18b117..0b4023af1b 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/comm/NodeMgrTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/comm/NodeMgrTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/comm/NodeTest.java b/modP2pImpl/test/org/aion/p2p/impl/comm/NodeTest.java
index d48d4ed576..7cec6f309b 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/comm/NodeTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/comm/NodeTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/comm/PeerMetricTest.java b/modP2pImpl/test/org/aion/p2p/impl/comm/PeerMetricTest.java
index f610f89527..31faf89f46 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/comm/PeerMetricTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/comm/PeerMetricTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.comm;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/one/msg/HelloTest.java b/modP2pImpl/test/org/aion/p2p/impl/one/msg/HelloTest.java
index 41cb6cebfb..e67a97cd33 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/one/msg/HelloTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/one/msg/HelloTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.one.msg;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqActiveNodesTest.java b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqActiveNodesTest.java
index f6d9d10624..cbd42c400e 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqActiveNodesTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqActiveNodesTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshake1Test.java b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshake1Test.java
index 968917a0a2..3b5d18d0e8 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshake1Test.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshake1Test.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshakeTest.java b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshakeTest.java
index 2d3ab61d70..8695aa1abc 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshakeTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ReqHandshakeTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResActiveNodesTest.java b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResActiveNodesTest.java
index 2929b3da0c..bd2244896d 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResActiveNodesTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResActiveNodesTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshake1Test.java b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshake1Test.java
index 22d8fa6d7a..c65cc1b71a 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshake1Test.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshake1Test.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshakeTest.java b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshakeTest.java
index 00aa9d9bea..51440f05f1 100644
--- a/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshakeTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl/zero/msg/ResHandshakeTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl.zero.msg;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/ChannelBufferTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/ChannelBufferTest.java
index ec232bc7b3..a8a96a0f99 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/ChannelBufferTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/ChannelBufferTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.Header.LEN;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgInTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgInTest.java
index 39f794c1c7..f5a9ce4454 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgInTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgInTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgOutTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgOutTest.java
index 7085af477b..82ceaba49b 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgOutTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/MsgOutTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskClearTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskClearTest.java
index fecd26e1c5..294d08d8c7 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskClearTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskClearTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskConnectPeersTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskConnectPeersTest.java
index 28990b2bea..66b534d553 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskConnectPeersTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskConnectPeersTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.aion.p2p.impl1.P2pMgr.p2pLOG;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskInboundTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskInboundTest.java
index 9b36c8f8d1..64c739d0e1 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskInboundTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskInboundTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskRecvTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskRecvTest.java
index c68c882241..292029cad4 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskRecvTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskRecvTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskSendTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskSendTest.java
index b58f5eff80..7e9d901b86 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskSendTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskSendTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskStatusTest.java b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskStatusTest.java
index f5ef0d132a..65c89a3f7b 100644
--- a/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskStatusTest.java
+++ b/modP2pImpl/test/org/aion/p2p/impl1/tasks/TaskStatusTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.p2p.impl1.tasks;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/modPrecompiled/src/org/aion/precompiled/ContractFactory.java b/modPrecompiled/src/org/aion/precompiled/ContractFactory.java
index ebc791f535..46b47b09f7 100644
--- a/modPrecompiled/src/org/aion/precompiled/ContractFactory.java
+++ b/modPrecompiled/src/org/aion/precompiled/ContractFactory.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modPrecompiled/src/org/aion/precompiled/PrecompiledUtilities.java b/modPrecompiled/src/org/aion/precompiled/PrecompiledUtilities.java
index 3ccebf72c3..a3ded29ad2 100644
--- a/modPrecompiled/src/org/aion/precompiled/PrecompiledUtilities.java
+++ b/modPrecompiled/src/org/aion/precompiled/PrecompiledUtilities.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled;
 
 import javax.annotation.Nonnull;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeController.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeController.java
index 34d8a2582a..b150532e4c 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeController.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeController.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static org.aion.precompiled.contracts.ATB.BridgeController.ProcessedResults.processError;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeDeserializer.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeDeserializer.java
index 59d0a88fc4..aefdf1ab5d 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeDeserializer.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeDeserializer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeEventSig.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeEventSig.java
index 337845c533..823e9c2a4a 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeEventSig.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeEventSig.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static org.aion.precompiled.contracts.ATB.BridgeUtilities.toEventSignature;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeFuncSig.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeFuncSig.java
index 02ecf76bf8..3555cefa22 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeFuncSig.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeFuncSig.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static org.aion.precompiled.contracts.ATB.BridgeUtilities.toSignature;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeStorageConnector.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeStorageConnector.java
index 421c0f6d10..4844c37cae 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeStorageConnector.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeStorageConnector.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeTransfer.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeTransfer.java
index 99c994a207..daf56266c9 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeTransfer.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeTransfer.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeUtilities.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeUtilities.java
index e73789f68a..75be937d40 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeUtilities.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BridgeUtilities.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BundleRequestCall.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BundleRequestCall.java
index 1534ebe4cb..7d78f3055b 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BundleRequestCall.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/BundleRequestCall.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import javax.annotation.Nonnull;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/ErrCode.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/ErrCode.java
index 7165de6297..f8af606f09 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/ErrCode.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/ErrCode.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 // utility helpers
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/TokenBridgeContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/TokenBridgeContract.java
index 4dd821f030..18c1721062 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/TokenBridgeContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/TokenBridgeContract.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static org.aion.precompiled.contracts.ATB.BridgeDeserializer.parseAddressFromCall;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/Transferable.java b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/Transferable.java
index 0c630d3bec..3fbef63c5c 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/ATB/Transferable.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/ATB/Transferable.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/AionAuctionContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/AionAuctionContract.java
index 902637f229..493f6fe844 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/AionAuctionContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/AionAuctionContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static org.aion.crypto.HashUtil.blake128;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/AionNameServiceContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/AionNameServiceContract.java
index 5982940857..d620774bb7 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/AionNameServiceContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/AionNameServiceContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static org.aion.crypto.HashUtil.blake128;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/Blake2bHashContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/Blake2bHashContract.java
index eae4aebc97..41c1ddaa23 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/Blake2bHashContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/Blake2bHashContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static org.aion.crypto.HashUtil.blake256;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/EDVerifyContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/EDVerifyContract.java
index 20e15af6ff..fb47479b7e 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/EDVerifyContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/EDVerifyContract.java
@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Centrys.
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts;
 
 import org.aion.base.type.Address;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/KeccakHash.java b/modPrecompiled/src/org/aion/precompiled/contracts/KeccakHash.java
index 5f4ee05d31..b17674b333 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/KeccakHash.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/KeccakHash.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static org.aion.crypto.HashUtil.keccak256;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/MultiSignatureContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/MultiSignatureContract.java
index caf51dcccf..e7434de01c 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/MultiSignatureContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/MultiSignatureContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/AbstractTRS.java b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/AbstractTRS.java
index 6fbd37b018..2b0442555c 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/AbstractTRS.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/AbstractTRS.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.TRS;
 
 import java.math.BigDecimal;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/PrivateTRScontract.java b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/PrivateTRScontract.java
index 3b6a576a7f..f1a773e0a4 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/PrivateTRScontract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/PrivateTRScontract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts.TRS;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSqueryContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSqueryContract.java
index 914a0d9bb7..f4819297e5 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSqueryContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSqueryContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts.TRS;
 
 import java.math.BigDecimal;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSstateContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSstateContract.java
index f760529ea5..573801b276 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSstateContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSstateContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts.TRS;
 
 import java.math.BigDecimal;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSuseContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSuseContract.java
index 5face0ea38..61cee08e78 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSuseContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/TRS/TRSuseContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts.TRS;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/contracts/TotalCurrencyContract.java b/modPrecompiled/src/org/aion/precompiled/contracts/TotalCurrencyContract.java
index 107ac84ee0..e8c2a3508d 100644
--- a/modPrecompiled/src/org/aion/precompiled/contracts/TotalCurrencyContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/contracts/TotalCurrencyContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/src/org/aion/precompiled/type/StatefulPrecompiledContract.java b/modPrecompiled/src/org/aion/precompiled/type/StatefulPrecompiledContract.java
index fe2c194462..827b976697 100644
--- a/modPrecompiled/src/org/aion/precompiled/type/StatefulPrecompiledContract.java
+++ b/modPrecompiled/src/org/aion/precompiled/type/StatefulPrecompiledContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.type;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modPrecompiled/test/org/aion/precompiled/PrecompiledUtilitiesTest.java b/modPrecompiled/test/org/aion/precompiled/PrecompiledUtilitiesTest.java
index 2138236793..19d9185e55 100644
--- a/modPrecompiled/test/org/aion/precompiled/PrecompiledUtilitiesTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/PrecompiledUtilitiesTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/TRS/TRShelpers.java b/modPrecompiled/test/org/aion/precompiled/TRS/TRShelpers.java
index efab40a97b..8f8bd4a2e6 100644
--- a/modPrecompiled/test/org/aion/precompiled/TRS/TRShelpers.java
+++ b/modPrecompiled/test/org/aion/precompiled/TRS/TRShelpers.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.TRS;
 
 import static junit.framework.TestCase.fail;
diff --git a/modPrecompiled/test/org/aion/precompiled/TRS/TRSlinkedListTest.java b/modPrecompiled/test/org/aion/precompiled/TRS/TRSlinkedListTest.java
index c2e9c7d5cb..9e115f13a7 100644
--- a/modPrecompiled/test/org/aion/precompiled/TRS/TRSlinkedListTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/TRS/TRSlinkedListTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.TRS;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/TRS/TRSqueryContractTest.java b/modPrecompiled/test/org/aion/precompiled/TRS/TRSqueryContractTest.java
index 5994f00d96..c6b1824bc2 100644
--- a/modPrecompiled/test/org/aion/precompiled/TRS/TRSqueryContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/TRS/TRSqueryContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.TRS;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/TRS/TRSstateContractTest.java b/modPrecompiled/test/org/aion/precompiled/TRS/TRSstateContractTest.java
index c448784427..c3abaa16f9 100644
--- a/modPrecompiled/test/org/aion/precompiled/TRS/TRSstateContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/TRS/TRSstateContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.TRS;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/TRS/TRSuseContractTest.java b/modPrecompiled/test/org/aion/precompiled/TRS/TRSuseContractTest.java
index 602b6313d8..02329e57f0 100644
--- a/modPrecompiled/test/org/aion/precompiled/TRS/TRSuseContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/TRS/TRSuseContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.TRS;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerOwnerTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerOwnerTest.java
index 2b6eefcef6..96213ba20f 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerOwnerTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerOwnerTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerRingTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerRingTest.java
index e2b3b91793..2948148bb8 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerRingTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeControllerRingTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeDeserializerTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeDeserializerTest.java
index b891212d5d..1b871e2a83 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeDeserializerTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeDeserializerTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeRingInitializationTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeRingInitializationTest.java
index 1c61739ca8..c472a513d9 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeRingInitializationTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeRingInitializationTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeStorageConnectorTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeStorageConnectorTest.java
index 8d17183c1b..384acd502b 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeStorageConnectorTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeStorageConnectorTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTestUtils.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTestUtils.java
index 0d5be440bd..f556a8d8eb 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTestUtils.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTestUtils.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import org.aion.base.type.Address;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTransferTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTransferTest.java
index 050276e43d..90bebdcac6 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTransferTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/BridgeTransferTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/TokenBridgeContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/TokenBridgeContractTest.java
index b6da0bbe62..6320c30c15 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/ATB/TokenBridgeContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/ATB/TokenBridgeContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts.ATB;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/AionAuctionContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/AionAuctionContractTest.java
index af42c0f264..1daf857b84 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/AionAuctionContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/AionAuctionContractTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/AionNameServiceContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/AionNameServiceContractTest.java
index 8d6bc687dc..48e3f208dc 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/AionNameServiceContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/AionNameServiceContractTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/BenchmarkTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/BenchmarkTest.java
index 446602ef80..57495b5e81 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/BenchmarkTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/BenchmarkTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts;
 
 import java.io.BufferedWriter;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/Blake2bHashTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/Blake2bHashTest.java
index ee867cf89a..9bf2896d27 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/Blake2bHashTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/Blake2bHashTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/DummyRepo.java b/modPrecompiled/test/org/aion/precompiled/contracts/DummyRepo.java
index 45c28c19e2..4bc8f5c11c 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/DummyRepo.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/DummyRepo.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java
index 7d3644dcbc..1d370617e0 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Centrys
- */
-
 package org.aion.precompiled.contracts;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/KeccakHashTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/KeccakHashTest.java
index 6361d19c45..2f04f6f1b5 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/KeccakHashTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/KeccakHashTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/MultiSignatureContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/MultiSignatureContractTest.java
index ffa025a76b..62dff96fb8 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/MultiSignatureContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/MultiSignatureContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/TXHashContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/TXHashContractTest.java
index a96ce9c0d1..5a4c69e866 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/TXHashContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/TXHashContractTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.precompiled.contracts;
 
 import static junit.framework.Assert.assertTrue;
diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/TotalCurrencyContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/TotalCurrencyContractTest.java
index 4139ae9f56..d80d3efc2b 100644
--- a/modPrecompiled/test/org/aion/precompiled/contracts/TotalCurrencyContractTest.java
+++ b/modPrecompiled/test/org/aion/precompiled/contracts/TotalCurrencyContractTest.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.contracts;
 
 import static org.junit.Assert.assertEquals;
diff --git a/modPrecompiled/test/org/aion/precompiled/encoding/AbiEncoder.java b/modPrecompiled/test/org/aion/precompiled/encoding/AbiEncoder.java
index 86167ead92..9d2dbf89c4 100644
--- a/modPrecompiled/test/org/aion/precompiled/encoding/AbiEncoder.java
+++ b/modPrecompiled/test/org/aion/precompiled/encoding/AbiEncoder.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.encoding;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/test/org/aion/precompiled/encoding/AddressFVM.java b/modPrecompiled/test/org/aion/precompiled/encoding/AddressFVM.java
index 726bac0397..03f7919e6f 100644
--- a/modPrecompiled/test/org/aion/precompiled/encoding/AddressFVM.java
+++ b/modPrecompiled/test/org/aion/precompiled/encoding/AddressFVM.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.encoding;
 
 import java.util.List;
diff --git a/modPrecompiled/test/org/aion/precompiled/encoding/BaseTypeFVM.java b/modPrecompiled/test/org/aion/precompiled/encoding/BaseTypeFVM.java
index cd9d8e663b..167e4edfab 100644
--- a/modPrecompiled/test/org/aion/precompiled/encoding/BaseTypeFVM.java
+++ b/modPrecompiled/test/org/aion/precompiled/encoding/BaseTypeFVM.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.encoding;
 
 import java.util.List;
diff --git a/modPrecompiled/test/org/aion/precompiled/encoding/Bytes32FVM.java b/modPrecompiled/test/org/aion/precompiled/encoding/Bytes32FVM.java
index 2bc89ec9de..9aa9a24786 100644
--- a/modPrecompiled/test/org/aion/precompiled/encoding/Bytes32FVM.java
+++ b/modPrecompiled/test/org/aion/precompiled/encoding/Bytes32FVM.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.encoding;
 
 import java.util.List;
diff --git a/modPrecompiled/test/org/aion/precompiled/encoding/ListFVM.java b/modPrecompiled/test/org/aion/precompiled/encoding/ListFVM.java
index 98106382f4..3abf7f3d68 100644
--- a/modPrecompiled/test/org/aion/precompiled/encoding/ListFVM.java
+++ b/modPrecompiled/test/org/aion/precompiled/encoding/ListFVM.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.encoding;
 
 import java.math.BigInteger;
diff --git a/modPrecompiled/test/org/aion/precompiled/encoding/Uint128FVM.java b/modPrecompiled/test/org/aion/precompiled/encoding/Uint128FVM.java
index 70d2efc27c..51fc56b82f 100644
--- a/modPrecompiled/test/org/aion/precompiled/encoding/Uint128FVM.java
+++ b/modPrecompiled/test/org/aion/precompiled/encoding/Uint128FVM.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.precompiled.encoding;
 
 import java.util.List;
diff --git a/modRlp/build.gradle b/modRlp/build.gradle
index a7b0db111e..3dc792deb7 100644
--- a/modRlp/build.gradle
+++ b/modRlp/build.gradle
@@ -1,7 +1,7 @@
 ext.moduleName = 'aion.rlp'
 
 dependencies {
-    compile project(':modAionBase')
+    compile project(':modUtil')
     compile files('../lib/libnsc.jar')
     compile 'com.google.guava:guava:25.1-jre'
 
diff --git a/modRlp/src/module-info.java b/modRlp/src/module-info.java
index 62ff40f692..be9a70d17b 100644
--- a/modRlp/src/module-info.java
+++ b/modRlp/src/module-info.java
@@ -1,5 +1,5 @@
 module aion.rlp {
-    requires aion.base;
+    requires aion.util;
 
     exports org.aion.rlp;
 }
diff --git a/modRlp/src/org/aion/rlp/CompactEncoder.java b/modRlp/src/org/aion/rlp/CompactEncoder.java
index 7def17ec44..29b564aed4 100644
--- a/modRlp/src/org/aion/rlp/CompactEncoder.java
+++ b/modRlp/src/org/aion/rlp/CompactEncoder.java
@@ -1,43 +1,9 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import static java.util.Arrays.copyOf;
 import static java.util.Arrays.copyOfRange;
-import static org.aion.base.util.ByteUtil.appendByte;
 import static org.aion.rlp.Utils.hexEncode;
+import static org.aion.util.bytes.ByteUtil.appendByte;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/modRlp/src/org/aion/rlp/DecodeResult.java b/modRlp/src/org/aion/rlp/DecodeResult.java
index 03be7fa1ba..0fdaee842e 100644
--- a/modRlp/src/org/aion/rlp/DecodeResult.java
+++ b/modRlp/src/org/aion/rlp/DecodeResult.java
@@ -1,41 +1,7 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.io.Serializable;
-import org.aion.base.util.Hex;
+import org.aion.util.conversions.Hex;
 
 @SuppressWarnings("serial")
 public class DecodeResult implements Serializable {
diff --git a/modRlp/src/org/aion/rlp/RLP.java b/modRlp/src/org/aion/rlp/RLP.java
index e20873cb51..9767712f35 100644
--- a/modRlp/src/org/aion/rlp/RLP.java
+++ b/modRlp/src/org/aion/rlp/RLP.java
@@ -1,52 +1,18 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import static java.util.Arrays.copyOfRange;
-import static org.aion.base.util.ByteUtil.byteArrayToInt;
-import static org.aion.base.util.ByteUtil.intToBytesNoLeadZeroes;
-import static org.aion.base.util.ByteUtil.isNullOrZeroArray;
-import static org.aion.base.util.ByteUtil.isSingleZero;
 import static org.aion.rlp.Utils.asUnsignedByteArray;
 import static org.aion.rlp.Utils.concatenate;
+import static org.aion.util.bytes.ByteUtil.byteArrayToInt;
+import static org.aion.util.bytes.ByteUtil.intToBytesNoLeadZeroes;
+import static org.aion.util.bytes.ByteUtil.isNullOrZeroArray;
+import static org.aion.util.bytes.ByteUtil.isSingleZero;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.Hex;
+import org.aion.util.bytes.ByteUtil;
+import org.aion.util.conversions.Hex;
 
 /**
  * @author Roman Mandeleil 2014
diff --git a/modRlp/src/org/aion/rlp/RLPElement.java b/modRlp/src/org/aion/rlp/RLPElement.java
index 8eccf28ad3..b0c617064e 100644
--- a/modRlp/src/org/aion/rlp/RLPElement.java
+++ b/modRlp/src/org/aion/rlp/RLPElement.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.io.Serializable;
diff --git a/modRlp/src/org/aion/rlp/RLPItem.java b/modRlp/src/org/aion/rlp/RLPItem.java
index 9b43a1ccdc..8f0f24d701 100644
--- a/modRlp/src/org/aion/rlp/RLPItem.java
+++ b/modRlp/src/org/aion/rlp/RLPItem.java
@@ -1,40 +1,6 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
-import org.aion.base.util.ByteUtil;
+import org.aion.util.bytes.ByteUtil;
 
 /**
  * @author Roman Mandeleil 2014
diff --git a/modRlp/src/org/aion/rlp/RLPList.java b/modRlp/src/org/aion/rlp/RLPList.java
index 4a7e24f21d..4cfdf10e24 100644
--- a/modRlp/src/org/aion/rlp/RLPList.java
+++ b/modRlp/src/org/aion/rlp/RLPList.java
@@ -1,41 +1,7 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.util.ArrayList;
-import org.aion.base.util.ByteUtil;
+import org.aion.util.bytes.ByteUtil;
 
 /**
  * @author Roman Mandeleil
diff --git a/modRlp/src/org/aion/rlp/Utils.java b/modRlp/src/org/aion/rlp/Utils.java
index ea6380543f..c4dc61de49 100644
--- a/modRlp/src/org/aion/rlp/Utils.java
+++ b/modRlp/src/org/aion/rlp/Utils.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.math.BigInteger;
diff --git a/modRlp/src/org/aion/rlp/Value.java b/modRlp/src/org/aion/rlp/Value.java
index 63a05fb5e5..4adeb07ea5 100644
--- a/modRlp/src/org/aion/rlp/Value.java
+++ b/modRlp/src/org/aion/rlp/Value.java
@@ -1,44 +1,10 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.Hex;
+import org.aion.util.bytes.ByteUtil;
+import org.aion.util.conversions.Hex;
 
 /**
  * Class to encapsulate an object and provide utilities for conversion
diff --git a/modRlp/test/org/aion/rlp/ByteUtilTest.java b/modRlp/test/org/aion/rlp/ByteUtilTest.java
index ac3b0c0056..db58724b08 100644
--- a/modRlp/test/org/aion/rlp/ByteUtilTest.java
+++ b/modRlp/test/org/aion/rlp/ByteUtilTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.rlp;
 
 import static org.junit.Assert.assertArrayEquals;
@@ -42,14 +7,15 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.FastByteComparisons;
-import org.aion.base.util.Hex;
+import org.aion.util.bytes.ByteUtil;
+import org.aion.util.conversions.Hex;
 import org.junit.Assert;
 import org.junit.Test;
 import org.spongycastle.util.BigIntegers;
 
+/** TODO: functionality should be moved to modUtil */
 public class ByteUtilTest {
 
     @Test
@@ -268,7 +234,7 @@ public void testIncrementPerformance() {
             byte[] max = ByteBuffer.allocate(4).putInt(Integer.MAX_VALUE).array();
             long start1 = System.currentTimeMillis();
             while (ByteUtil.increment(counter1)) {
-                if (FastByteComparisons.compareTo(counter1, 0, 4, max, 0, 4) == 0) {
+                if (compareTo(counter1, 0, 4, max, 0, 4) == 0) {
                     break;
                 }
             }
@@ -294,6 +260,15 @@ public void testIncrementPerformance() {
         }
     }
 
+    /** Compares two regions of byte array. */
+    public static int compareTo(
+            byte[] array1, int offset1, int size1, byte[] array2, int offset2, int size2) {
+        byte[] b1 = Arrays.copyOfRange(array1, offset1, offset1 + size1);
+        byte[] b2 = Arrays.copyOfRange(array2, offset2, offset2 + size2);
+
+        return Arrays.compare(b1, b2);
+    }
+
     @Test
     public void firstNonZeroByte_1() {
 
diff --git a/modRlp/test/org/aion/rlp/CompactEncoderTest.java b/modRlp/test/org/aion/rlp/CompactEncoderTest.java
index 0de5aeb97e..475188e9b3 100644
--- a/modRlp/test/org/aion/rlp/CompactEncoderTest.java
+++ b/modRlp/test/org/aion/rlp/CompactEncoderTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modRlp/test/org/aion/rlp/DecodeResultTest.java b/modRlp/test/org/aion/rlp/DecodeResultTest.java
index 2fbdd4c3c5..130f1f2d13 100644
--- a/modRlp/test/org/aion/rlp/DecodeResultTest.java
+++ b/modRlp/test/org/aion/rlp/DecodeResultTest.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.rlp;
 
 import org.junit.Test;
diff --git a/modRlp/test/org/aion/rlp/RLPDump.java b/modRlp/test/org/aion/rlp/RLPDump.java
index 52c9e49ad5..ace7b3f7c9 100644
--- a/modRlp/test/org/aion/rlp/RLPDump.java
+++ b/modRlp/test/org/aion/rlp/RLPDump.java
@@ -1,41 +1,7 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.util.Arrays;
-import org.aion.base.util.Hex;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 public class RLPDump {
diff --git a/modRlp/test/org/aion/rlp/RLPElementTest.java b/modRlp/test/org/aion/rlp/RLPElementTest.java
index 6ed78cef83..550ea35085 100644
--- a/modRlp/test/org/aion/rlp/RLPElementTest.java
+++ b/modRlp/test/org/aion/rlp/RLPElementTest.java
@@ -1,31 +1,8 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.rlp;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.aion.base.util.ByteUtil;
+import org.aion.util.bytes.ByteUtil;
 import org.junit.Test;
 
 public class RLPElementTest {
diff --git a/modRlp/test/org/aion/rlp/RLPSpecExtraTest.java b/modRlp/test/org/aion/rlp/RLPSpecExtraTest.java
index 88c9a3d3bb..7688ecf534 100644
--- a/modRlp/test/org/aion/rlp/RLPSpecExtraTest.java
+++ b/modRlp/test/org/aion/rlp/RLPSpecExtraTest.java
@@ -1,30 +1,6 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.rlp;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
-import static org.aion.base.util.ByteUtil.byteArrayToInt;
 import static org.aion.rlp.RLPSpecTest.assertDecodeBigInteger;
 import static org.aion.rlp.RLPSpecTest.assertDecodeInt;
 import static org.aion.rlp.RLPSpecTest.assertDecodeLong;
@@ -33,11 +9,13 @@
 import static org.aion.rlp.RLPSpecTest.assertEncodeLong;
 import static org.aion.rlp.RLPSpecTest.assertEncodeShort;
 import static org.aion.rlp.Utils.asUnsignedByteArray;
+import static org.aion.util.bytes.ByteUtil.EMPTY_BYTE_ARRAY;
+import static org.aion.util.bytes.ByteUtil.byteArrayToInt;
 
 import java.math.BigInteger;
 import java.util.List;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.Hex;
+import org.aion.util.bytes.ByteUtil;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 /**
diff --git a/modRlp/test/org/aion/rlp/RLPSpecTest.java b/modRlp/test/org/aion/rlp/RLPSpecTest.java
index e493b6e52f..66e302ba0a 100644
--- a/modRlp/test/org/aion/rlp/RLPSpecTest.java
+++ b/modRlp/test/org/aion/rlp/RLPSpecTest.java
@@ -1,38 +1,16 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.rlp;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.aion.base.util.ByteUtil.EMPTY_BYTE_ARRAY;
-import static org.aion.base.util.ByteUtil.byteArrayToInt;
-import static org.aion.base.util.ByteUtil.byteArrayToLong;
 import static org.aion.rlp.RLPTest.bytesToAscii;
 import static org.aion.rlp.Utils.asUnsignedByteArray;
+import static org.aion.util.bytes.ByteUtil.EMPTY_BYTE_ARRAY;
+import static org.aion.util.bytes.ByteUtil.byteArrayToInt;
+import static org.aion.util.bytes.ByteUtil.byteArrayToLong;
 
 import java.math.BigInteger;
 import java.util.List;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.Hex;
+import org.aion.util.bytes.ByteUtil;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 /**
diff --git a/modRlp/test/org/aion/rlp/RLPTest.java b/modRlp/test/org/aion/rlp/RLPTest.java
index c031be4808..6026016edd 100644
--- a/modRlp/test/org/aion/rlp/RLPTest.java
+++ b/modRlp/test/org/aion/rlp/RLPTest.java
@@ -1,40 +1,5 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
-import static org.aion.base.util.ByteUtil.byteArrayToInt;
 import static org.aion.rlp.RLP.decode;
 import static org.aion.rlp.RLP.decode2;
 import static org.aion.rlp.RLP.decodeInt;
@@ -74,6 +39,7 @@
 import static org.aion.rlp.RlpTestData.test12;
 import static org.aion.rlp.RlpTestData.test13;
 import static org.aion.rlp.RlpTestData.test16;
+import static org.aion.util.bytes.ByteUtil.byteArrayToInt;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertArrayEquals;
@@ -88,7 +54,7 @@
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Objects;
-import org.aion.base.util.Hex;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 public class RLPTest {
diff --git a/modRlp/test/org/aion/rlp/RlpTestData.java b/modRlp/test/org/aion/rlp/RlpTestData.java
index 5824a9fe23..46ff4f2a14 100644
--- a/modRlp/test/org/aion/rlp/RlpTestData.java
+++ b/modRlp/test/org/aion/rlp/RlpTestData.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import java.math.BigInteger;
diff --git a/modRlp/test/org/aion/rlp/UtilsTest.java b/modRlp/test/org/aion/rlp/UtilsTest.java
index e047e084a9..721d7d86a1 100644
--- a/modRlp/test/org/aion/rlp/UtilsTest.java
+++ b/modRlp/test/org/aion/rlp/UtilsTest.java
@@ -1,31 +1,9 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.rlp;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import java.util.Arrays;
-import org.aion.base.util.Hex;
+import org.aion.util.conversions.Hex;
 import org.junit.Test;
 
 public class UtilsTest {
diff --git a/modRlp/test/org/aion/rlp/ValueTest.java b/modRlp/test/org/aion/rlp/ValueTest.java
index fba88b34f6..77b068e26a 100644
--- a/modRlp/test/org/aion/rlp/ValueTest.java
+++ b/modRlp/test/org/aion/rlp/ValueTest.java
@@ -1,37 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
 package org.aion.rlp;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/modTxPool/src/org/aion/txpool/ITxPool.java b/modTxPool/src/org/aion/txpool/ITxPool.java
index da4d6710f4..2ee53c6198 100644
--- a/modTxPool/src/org/aion/txpool/ITxPool.java
+++ b/modTxPool/src/org/aion/txpool/ITxPool.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.txpool;
 
 import java.math.BigInteger;
diff --git a/modTxPool/src/org/aion/txpool/TxPoolModule.java b/modTxPool/src/org/aion/txpool/TxPoolModule.java
index 558c0bf64e..48d1b3296c 100644
--- a/modTxPool/src/org/aion/txpool/TxPoolModule.java
+++ b/modTxPool/src/org/aion/txpool/TxPoolModule.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.txpool;
 
 import java.util.Properties;
diff --git a/modTxPoolImpl/src/org/aion/txpool/common/AbstractTxPool.java b/modTxPoolImpl/src/org/aion/txpool/common/AbstractTxPool.java
index 3ee6e3cb82..4509e5eb01 100644
--- a/modTxPoolImpl/src/org/aion/txpool/common/AbstractTxPool.java
+++ b/modTxPoolImpl/src/org/aion/txpool/common/AbstractTxPool.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.txpool.common;
 
 import java.math.BigInteger;
diff --git a/modTxPoolImpl/src/org/aion/txpool/common/AccountState.java b/modTxPoolImpl/src/org/aion/txpool/common/AccountState.java
index ace7701449..298c325f86 100644
--- a/modTxPoolImpl/src/org/aion/txpool/common/AccountState.java
+++ b/modTxPoolImpl/src/org/aion/txpool/common/AccountState.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.txpool.common;
 
 import java.math.BigInteger;
diff --git a/modTxPoolImpl/src/org/aion/txpool/common/TxDependList.java b/modTxPoolImpl/src/org/aion/txpool/common/TxDependList.java
index 6ceb9eacf6..d6642169ab 100644
--- a/modTxPoolImpl/src/org/aion/txpool/common/TxDependList.java
+++ b/modTxPoolImpl/src/org/aion/txpool/common/TxDependList.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.txpool.common;
 
 import java.math.BigInteger;
diff --git a/modTxPoolImpl/src/org/aion/txpool/zero/TxPoolA0.java b/modTxPoolImpl/src/org/aion/txpool/zero/TxPoolA0.java
index 57a78ccfef..aa3b1fe83f 100644
--- a/modTxPoolImpl/src/org/aion/txpool/zero/TxPoolA0.java
+++ b/modTxPoolImpl/src/org/aion/txpool/zero/TxPoolA0.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.txpool.zero;
 
 import java.math.BigInteger;
diff --git a/modTxPoolImpl/test/org/aion/txpool/test/TxnPoolTest.java b/modTxPoolImpl/test/org/aion/txpool/test/TxnPoolTest.java
index ab7a4eb5cc..0ffbfa95f4 100644
--- a/modTxPoolImpl/test/org/aion/txpool/test/TxnPoolTest.java
+++ b/modTxPoolImpl/test/org/aion/txpool/test/TxnPoolTest.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.txpool.test;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/modUtil/build.gradle b/modUtil/build.gradle
new file mode 100644
index 0000000000..ddf19dc71f
--- /dev/null
+++ b/modUtil/build.gradle
@@ -0,0 +1,6 @@
+ext.moduleName = 'aion.util'
+
+dependencies {
+    testCompile 'junit:junit:4.12'
+    testCompile 'pl.pragmatists:JUnitParams:1.1.1'
+}
diff --git a/modUtil/src/module-info.java b/modUtil/src/module-info.java
new file mode 100644
index 0000000000..83b2a379e0
--- /dev/null
+++ b/modUtil/src/module-info.java
@@ -0,0 +1,5 @@
+module aion.util {
+    exports org.aion.util;
+    exports org.aion.util.bytes;
+    exports org.aion.util.conversions;
+}
diff --git a/modUtil/src/org/aion/util/NativeLoader.java b/modUtil/src/org/aion/util/NativeLoader.java
new file mode 100644
index 0000000000..ca356ac60f
--- /dev/null
+++ b/modUtil/src/org/aion/util/NativeLoader.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2017-2018 Aion foundation.
+ *
+ *     This file is part of the aion network project.
+ *
+ *     The aion network project 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 any later version.
+ *
+ *     The aion network project 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 the aion network project source files.
+ *     If not, see <https://www.gnu.org/licenses/>.
+ *
+ *     The aion network project leverages useful source code from other
+ *     open source projects. We greatly appreciate the effort that was
+ *     invested in these projects and we thank the individual contributors
+ *     for their work. For provenance information and contributors
+ *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
+ *
+ * Contributors to the aion source files in decreasing order of code volume:
+ *     Aion foundation.
+ *     <ether.camp> team through the ethereumJ library.
+ *     Ether.Camp Inc. (US) team through Ethereum Harmony.
+ *     John Tromp through the Equihash solver.
+ *     Samuel Neves through the BLAKE2 implementation.
+ *     Zcash project team.
+ *     Bitcoinj team.
+ */
+
+package org.aion.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Scanner;
+
+// import java.io.FileNotFoundException;
+// import java.io.FileOutputStream;
+// import java.io.InputStream;
+// import java.io.OutputStream;
+
+/**
+ * Native library loader.
+ *
+ * @author jin
+ */
+public class NativeLoader {
+
+    /**
+     * Returns the current OS name.
+     *
+     * @return
+     */
+    public static String getOS() {
+        String osName = System.getProperty("os.name").toLowerCase();
+        if (osName.contains("win")) {
+            return "win";
+        } else if (osName.contains("linux")) {
+            return "linux";
+        } else if (osName.contains("mac")) {
+            return "mac";
+        } else {
+            throw new RuntimeException("Unrecognized OS: " + osName);
+        }
+    }
+
+    /**
+     * Builds a file path given a list of folder names.
+     *
+     * @param args
+     * @return
+     */
+    public static File buildPath(String... args) {
+        StringBuilder sb = new StringBuilder();
+        for (String arg : args) {
+            sb.append(File.separator);
+            sb.append(arg);
+        }
+
+        return sb.length() > 0 ? new File(sb.substring(1)) : new File(".");
+    }
+
+    /**
+     * Loads library based on the file list in the given module folder.
+     *
+     * @param module
+     */
+    public static void loadLibrary(String module) {
+        File dir = buildPath("native", getOS(), module);
+
+        try (Scanner s = new Scanner(new File(dir, "file.list"))) {
+            while (s.hasNextLine()) {
+                String line = s.nextLine();
+
+                if (line.startsWith("/") || line.startsWith(".")) { // for debug
+                    // purpose
+                    // mainly
+                    System.load(line);
+                } else {
+                    System.load(new File(dir, line).getCanonicalPath());
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to load libraries for " + module, e);
+        }
+    }
+
+    //    public static void loadLibraryFromJar(@SuppressWarnings("rawtypes") Class clz, String
+    // path)
+    //            throws IOException {
+    //
+    //        if (!path.startsWith("/")) {
+    //            throw new IllegalArgumentException("The path has to be absolute (start with
+    // '/').");
+    //        }
+    //
+    //        // Obtain filename from path
+    //        String[] parts = path.split("/");
+    //        String filename = (parts.length > 1) ? parts[parts.length - 1] : null;
+    //
+    //        // Split filename to prexif and suffix (extension)
+    //        String prefix = "";
+    //        String suffix = null;
+    //        if (filename != null) {
+    //            parts = filename.split("\\.", 2);
+    //            prefix = parts[0];
+    //            suffix = (parts.length > 1) ? "." + parts[parts.length - 1] : null;
+    //        }
+    //
+    //        // Check if the filename is okay
+    //        if (filename == null || prefix.length() < 3) {
+    //            throw new IllegalArgumentException(
+    //                    "The filename has to be at least 3 characters long.");
+    //        }
+    //
+    //        // Prepare temporary file
+    //        File temp = File.createTempFile(prefix, suffix);
+    //        temp.deleteOnExit();
+    //
+    //        if (!temp.exists()) {
+    //            throw new FileNotFoundException("File " + temp.getAbsolutePath() + " does not
+    // exist.");
+    //        }
+    //
+    //        // Prepare buffer for data copying
+    //        byte[] buffer = new byte[1024];
+    //        int readBytes;
+    //
+    //        // Open and check input stream
+    //        InputStream is = clz.getResourceAsStream(path);
+    //        if (is == null) {
+    //            throw new FileNotFoundException("File " + path + " was not found inside JAR.");
+    //        }
+    //
+    //        // Open output stream and copy data between source file in JAR and the
+    //        // temporary file
+    //        OutputStream os = new FileOutputStream(temp);
+    //        try {
+    //            while ((readBytes = is.read(buffer)) != -1) {
+    //                os.write(buffer, 0, readBytes);
+    //            }
+    //        } finally {
+    //            // If read/write fails, close streams safely before throwing an
+    //            // exception
+    //            os.close();
+    //            is.close();
+    //        }
+    //
+    //        // Finally, load the library
+    //        System.load(temp.getAbsolutePath());
+    //    }
+}
diff --git a/modUtil/src/org/aion/util/bytes/ByteUtil.java b/modUtil/src/org/aion/util/bytes/ByteUtil.java
new file mode 100644
index 0000000000..65dc147549
--- /dev/null
+++ b/modUtil/src/org/aion/util/bytes/ByteUtil.java
@@ -0,0 +1,738 @@
+/*
+ * Copyright (c) 2017-2018 Aion foundation.
+ *
+ *     This file is part of the aion network project.
+ *
+ *     The aion network project 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 any later version.
+ *
+ *     The aion network project 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 the aion network project source files.
+ *     If not, see <https://www.gnu.org/licenses/>.
+ *
+ *     The aion network project leverages useful source code from other
+ *     open source projects. We greatly appreciate the effort that was
+ *     invested in these projects and we thank the individual contributors
+ *     for their work. For provenance information and contributors
+ *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
+ *
+ * Contributors to the aion source files in decreasing order of code volume:
+ *     Aion foundation.
+ *     <ether.camp> team through the ethereumJ library.
+ *     Ether.Camp Inc. (US) team through Ethereum Harmony.
+ *     John Tromp through the Equihash solver.
+ *     Samuel Neves through the BLAKE2 implementation.
+ *     Zcash project team.
+ *     Bitcoinj team.
+ */
+
+package org.aion.util.bytes;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import org.aion.util.conversions.Hex;
+
+public class ByteUtil {
+
+    public static final byte[] EMPTY_WORD = new byte[32];
+    public static final byte[] EMPTY_HALFWORD = new byte[16];
+    public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+    public static final byte[] ZERO_BYTE_ARRAY = new byte[] {0};
+    public static final String EMPTY_STRING = "";
+
+    /** Creates a copy of bytes and appends b to the end of it */
+    public static byte[] appendByte(byte[] bytes, byte b) {
+        byte[] result = Arrays.copyOf(bytes, bytes.length + 1);
+        result[result.length - 1] = b;
+        return result;
+    }
+
+    /**
+     * The regular {@link BigInteger#toByteArray()} method isn't quite what we often need: it
+     * appends a leading zero to indicate that the number is positive and may need padding.
+     *
+     * @param b the integer to format into a byte array
+     * @param numBytes the desired size of the resulting byte array
+     * @return numBytes byte long array.
+     */
+    public static byte[] bigIntegerToBytes(BigInteger b, int numBytes) {
+        if (b == null) {
+            return null;
+        }
+        byte[] bytes = new byte[numBytes];
+        byte[] biBytes = b.toByteArray();
+        int start = (biBytes.length == numBytes + 1) ? 1 : 0;
+        int length = Math.min(biBytes.length, numBytes);
+        System.arraycopy(biBytes, start, bytes, numBytes - length, length);
+        return bytes;
+    }
+
+    public static byte[] bigIntegerToBytesSigned(BigInteger b, int numBytes) {
+        if (b == null) {
+            return null;
+        }
+        byte[] bytes = new byte[numBytes];
+        Arrays.fill(bytes, b.signum() < 0 ? (byte) 0xFF : 0x00);
+        byte[] biBytes = b.toByteArray();
+        int start = (biBytes.length == numBytes + 1) ? 1 : 0;
+        int length = Math.min(biBytes.length, numBytes);
+        System.arraycopy(biBytes, start, bytes, numBytes - length, length);
+        return bytes;
+    }
+
+    /**
+     * Omitting sign indication byte. <br>
+     * <br>
+     * Instead of {@code org.spongycastle.util.BigIntegers#asUnsignedByteArray(BigInteger)} <br>
+     * we use this custom method to avoid an empty array in case of BigInteger.ZERO
+     *
+     * @param value - any big integer number. A <code>null</code>-value will return <code>null
+     *     </code>
+     * @return A byte array without a leading zero byte if present in the signed encoding.
+     *     BigInteger.ZERO will return an array with length 1 and byte-value 0.
+     */
+    public static byte[] bigIntegerToBytes(BigInteger value) {
+        if (value == null) {
+            return null;
+        }
+
+        byte[] data = value.toByteArray();
+
+        if (data.length != 1 && data[0] == 0) {
+            byte[] tmp = new byte[data.length - 1];
+            System.arraycopy(data, 1, tmp, 0, tmp.length);
+            data = tmp;
+        }
+        return data;
+    }
+
+    public static BigInteger bytesToBigInteger(byte[] bb) {
+        return bb.length == 0 ? BigInteger.ZERO : new BigInteger(1, bb);
+    }
+
+    /**
+     * Returns the amount of nibbles that match each other from 0 ... amount will never be larger
+     * than smallest input
+     *
+     * @param a - first input
+     * @param b - second input
+     * @return Number of bytes that match
+     */
+    public static int matchingNibbleLength(byte[] a, byte[] b) {
+        int i = 0;
+        int length = a.length < b.length ? a.length : b.length;
+        while (i < length) {
+            if (a[i] != b[i]) {
+                return i;
+            }
+            i++;
+        }
+        return i;
+    }
+
+    /** Perform an in-place conversion of a byte array from big endian to little endian. */
+    public static void toLEByteArray(byte[] toConvert) {
+
+        if (toConvert == null) {
+            return;
+        }
+
+        for (int i = 0; i < toConvert.length / 2; i++) {
+            byte temp = toConvert[i];
+            toConvert[i] = toConvert[toConvert.length - 1 - i];
+            toConvert[toConvert.length - 1 - i] = temp;
+        }
+    }
+
+    /**
+     * Converts a long value into a byte array.
+     *
+     * @param val - long value to convert
+     * @return <code>byte[]</code> of length 8, representing the long value
+     */
+    public static byte[] longToBytes(long val) {
+        return ByteBuffer.allocate(8).putLong(val).array();
+    }
+
+    public static byte[] longToBytesLE(long val) {
+        ByteBuffer bb = ByteBuffer.allocate(8);
+        bb.order(ByteOrder.LITTLE_ENDIAN);
+        return bb.putLong(val).array();
+    }
+
+    /**
+     * Converts a long value into a byte array.
+     *
+     * @param val - long value to convert
+     * @return decimal value with leading byte that are zeroes striped
+     */
+    public static byte[] longToBytesNoLeadZeroes(long val) {
+
+        // todo: improve performance by while strip numbers until (long >> 8 ==
+        // 0)
+        if (val == 0) {
+            return EMPTY_BYTE_ARRAY;
+        }
+
+        byte[] data = ByteBuffer.allocate(8).putLong(val).array();
+
+        return stripLeadingZeroes(data);
+    }
+
+    /**
+     * Converts int value into a byte array.
+     *
+     * @param val - int value to convert
+     * @return <code>byte[]</code> of length 4, representing the int value
+     */
+    public static byte[] intToBytes(int val) {
+        return ByteBuffer.allocate(4).putInt(val).array();
+    }
+
+    /**
+     * Converts and int value to a byte array (Little Endian) @ param val
+     *
+     * @return <code>byte[]</code> of length 4; representing the int value in LE order
+     */
+    public static byte[] intToBytesLE(int val) {
+        ByteBuffer bb = ByteBuffer.allocate(4);
+        bb.order(ByteOrder.LITTLE_ENDIAN);
+        return bb.putInt(val).array();
+    }
+
+    /**
+     * Converts and int value to a byte array (Big Endian) @ param val
+     *
+     * @return <code>byte[]</code> of length 4; representing the int value in LE order
+     */
+    public static byte[] intToBytesBE(int val) {
+        ByteBuffer bb = ByteBuffer.allocate(4);
+        bb.order(ByteOrder.BIG_ENDIAN);
+        return bb.putInt(val).array();
+    }
+
+    /**
+     * Converts a int value into a byte array.
+     *
+     * @param val - int value to convert
+     * @return value with leading byte that are zeroes striped
+     */
+    public static byte[] intToBytesNoLeadZeroes(int val) {
+
+        if (val == 0) {
+            return EMPTY_BYTE_ARRAY;
+        }
+
+        int lenght = 0;
+
+        int tmpVal = val;
+        while (tmpVal != 0) {
+            tmpVal = tmpVal >>> 8;
+            ++lenght;
+        }
+
+        byte[] result = new byte[lenght];
+
+        int index = result.length - 1;
+        while (val != 0) {
+
+            result[index] = (byte) (val & 0xFF);
+            val = val >>> 8;
+            index -= 1;
+        }
+
+        return result;
+    }
+
+    /**
+     * Convert a byte-array into a hex String.<br>
+     * Works similar to {@link Hex#toHexString} but allows for <code>null</code>
+     *
+     * @param data - byte-array to convert to a hex-string
+     * @return hex representation of the data.<br>
+     *     Returns an empty String if the input is <code>null</code> TODO: swap out with more
+     *     efficient implementation, for now seems like we are stuck with this
+     * @see Hex#toHexString
+     */
+    public static String toHexString(byte[] data) {
+        return data == null ? "" : Hex.toHexString(data);
+    }
+
+    public static String toHexStringWithPrefix(byte[] data) {
+        return "0x" + toHexString(data);
+    }
+
+    /**
+     * Calculate packet length
+     *
+     * @param msg byte[]
+     * @return byte-array with 4 elements
+     */
+    public static byte[] calcPacketLength(byte[] msg) {
+        int msgLen = msg.length;
+        return new byte[] {
+            (byte) ((msgLen >> 24) & 0xFF),
+            (byte) ((msgLen >> 16) & 0xFF),
+            (byte) ((msgLen >> 8) & 0xFF),
+            (byte) ((msgLen) & 0xFF)
+        };
+    }
+
+    /**
+     * Cast hex encoded value from byte[] to int
+     *
+     * <p>Limited to Integer.MAX_VALUE: 2^31-1 (4 bytes)
+     *
+     * @param b array contains the values
+     * @return unsigned positive int value.
+     */
+    public static int byteArrayToInt(byte[] b) {
+        if (b == null || b.length == 0) {
+            return 0;
+        }
+        return new BigInteger(1, b).intValue();
+    }
+
+    /**
+     * Cast hex encoded value from byte[] to long
+     *
+     * <p>Limited to Long.MAX_VALUE: 2^63-1 (8 bytes)
+     *
+     * @param b array contains the values
+     * @return unsigned positive long value.
+     */
+    public static long byteArrayToLong(byte[] b) {
+        if (b == null || b.length == 0) {
+            return 0;
+        }
+        return new BigInteger(1, b).longValue();
+    }
+
+    /** Used in conjunction w/ RLP, casts to byte */
+    public static byte toByte(byte[] b) {
+        if (b == null || b.length == 0) {
+            return 0;
+        }
+        return b[0];
+    }
+
+    /**
+     * Turn nibbles to a pretty looking output string
+     *
+     * <p>Example. [ 1, 2, 3, 4, 5 ] becomes '\x11\x23\x45'
+     *
+     * @param nibbles - getting byte of data [ 04 ] and turning it to a '\x04' representation
+     * @return pretty string of nibbles
+     */
+    public static String nibblesToPrettyString(byte[] nibbles) {
+        StringBuilder builder = new StringBuilder();
+        for (byte nibble : nibbles) {
+            final String nibbleString = oneByteToHexString(nibble);
+            builder.append("\\x").append(nibbleString);
+        }
+        return builder.toString();
+    }
+
+    public static String oneByteToHexString(byte value) {
+        String retVal = Integer.toString(value & 0xFF, 16);
+        if (retVal.length() == 1) {
+            retVal = "0" + retVal;
+        }
+        return retVal;
+    }
+
+    /**
+     * Calculate the number of bytes need to encode the number
+     *
+     * @param val - number
+     * @return number of min bytes used to encode the number
+     */
+    public static int numBytes(String val) {
+
+        BigInteger bInt = new BigInteger(val);
+        int bytes = 0;
+
+        while (!bInt.equals(BigInteger.ZERO)) {
+            bInt = bInt.shiftRight(8);
+            ++bytes;
+        }
+        if (bytes == 0) {
+            ++bytes;
+        }
+        return bytes;
+    }
+
+    /**
+     * @param arg - not more that 32 bits
+     * @return - bytes of the value pad with complete to 32 zeroes
+     */
+    public static byte[] encodeValFor32Bits(Object arg) {
+
+        byte[] data;
+
+        // check if the string is numeric
+        if (arg.toString().trim().matches("-?\\d+(\\.\\d+)?")) {
+            data = new BigInteger(arg.toString().trim()).toByteArray();
+        } // check if it's hex number
+        else if (arg.toString().trim().matches("0[xX][0-9a-fA-F]+")) {
+            data = new BigInteger(arg.toString().trim().substring(2), 16).toByteArray();
+        } else {
+            data = arg.toString().trim().getBytes();
+        }
+
+        if (data.length > 32) {
+            throw new RuntimeException("values can't be more than 32 byte");
+        }
+
+        byte[] val = new byte[32];
+
+        int j = 0;
+        for (int i = data.length; i > 0; --i) {
+            val[31 - j] = data[i - 1];
+            ++j;
+        }
+        return val;
+    }
+
+    /**
+     * encode the values and concatenate together
+     *
+     * @param args Object
+     * @return byte[]
+     */
+    public static byte[] encodeDataList(Object... args) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        for (Object arg : args) {
+            byte[] val = encodeValFor32Bits(arg);
+            try {
+                baos.write(val);
+            } catch (IOException e) {
+                throw new Error("Happen something that should never happen ", e);
+            }
+        }
+        return baos.toByteArray();
+    }
+
+    public static int firstNonZeroByte(byte[] data) {
+        for (int i = 0; i < data.length; ++i) {
+            if (data[i] != 0) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static byte[] stripLeadingZeroes(byte[] data) {
+
+        if (data == null) {
+            return null;
+        }
+
+        final int firstNonZero = firstNonZeroByte(data);
+        switch (firstNonZero) {
+            case -1:
+                return ZERO_BYTE_ARRAY;
+
+            case 0:
+                return data;
+
+            default:
+                byte[] result = new byte[data.length - firstNonZero];
+                System.arraycopy(data, firstNonZero, result, 0, data.length - firstNonZero);
+
+                return result;
+        }
+    }
+
+    /**
+     * increment byte array as a number until max is reached
+     *
+     * @param bytes byte[]
+     * @return boolean
+     */
+    public static boolean increment(byte[] bytes) {
+        final int startIndex = 0;
+        int i;
+        for (i = bytes.length - 1; i >= startIndex; i--) {
+            bytes[i]++;
+            if (bytes[i] != 0) {
+                break;
+            }
+        }
+        // we return false when all bytes are 0 again
+        return (i >= startIndex || bytes[startIndex] != 0);
+    }
+
+    /**
+     * Utility function to copy a byte array into a new byte array with given size. If the src
+     * length is smaller than the given size, the result will be left-padded with zeros.
+     *
+     * @param value - a BigInteger with a maximum value of 2^256-1
+     * @return Byte array of given size with a copy of the <code>src</code>
+     */
+    public static byte[] copyToArray(BigInteger value) {
+        byte[] src = ByteUtil.bigIntegerToBytes(value);
+        byte[] dest = ByteBuffer.allocate(32).array();
+        System.arraycopy(src, 0, dest, dest.length - src.length, src.length);
+        return dest;
+    }
+
+    public static byte[] setBit(byte[] data, int pos, int val) {
+
+        if ((data.length * 8) - 1 < pos) {
+            throw new Error("outside byte array limit, pos: " + pos);
+        }
+
+        int posByte = data.length - 1 - (pos) / 8;
+        int posBit = (pos) % 8;
+        byte setter = (byte) (1 << (posBit));
+        byte toBeSet = data[posByte];
+        byte result;
+        if (val == 1) {
+            result = (byte) (toBeSet | setter);
+        } else {
+            result = (byte) (toBeSet & ~setter);
+        }
+
+        data[posByte] = result;
+        return data;
+    }
+
+    public static int getBit(byte[] data, int pos) {
+
+        if ((data.length * 8) - 1 < pos) {
+            throw new Error("outside byte array limit, pos: " + pos);
+        }
+
+        int posByte = data.length - 1 - pos / 8;
+        int posBit = pos % 8;
+        byte dataByte = data[posByte];
+        return Math.min(1, (dataByte & (1 << (posBit))));
+    }
+
+    public static byte[] and(byte[] b1, byte[] b2) {
+        if (b1.length != b2.length) {
+            throw new RuntimeException("Array sizes differ");
+        }
+        byte[] ret = new byte[b1.length];
+        for (int i = 0; i < ret.length; i++) {
+            ret[i] = (byte) (b1[i] & b2[i]);
+        }
+        return ret;
+    }
+
+    public static byte[] or(byte[] b1, byte[] b2) {
+        if (b1.length != b2.length) {
+            throw new RuntimeException("Array sizes differ");
+        }
+        byte[] ret = new byte[b1.length];
+        for (int i = 0; i < ret.length; i++) {
+            ret[i] = (byte) (b1[i] | b2[i]);
+        }
+        return ret;
+    }
+
+    public static byte[] xor(byte[] b1, byte[] b2) {
+        if (b1.length != b2.length) {
+            throw new RuntimeException("Array sizes differ");
+        }
+        byte[] ret = new byte[b1.length];
+        for (int i = 0; i < ret.length; i++) {
+            ret[i] = (byte) (b1[i] ^ b2[i]);
+        }
+        return ret;
+    }
+
+    /**
+     * XORs byte arrays of different lengths by aligning length of the shortest via adding zeros at
+     * beginning
+     */
+    public static byte[] xorAlignRight(byte[] b1, byte[] b2) {
+        if (b1.length > b2.length) {
+            byte[] b2_ = new byte[b1.length];
+            System.arraycopy(b2, 0, b2_, b1.length - b2.length, b2.length);
+            b2 = b2_;
+        } else if (b2.length > b1.length) {
+            byte[] b1_ = new byte[b2.length];
+            System.arraycopy(b1, 0, b1_, b2.length - b1.length, b1.length);
+            b1 = b1_;
+        }
+
+        return xor(b1, b2);
+    }
+
+    /**
+     * @param arrays - arrays to merge
+     * @return - merged array
+     */
+    public static byte[] merge(byte[]... arrays) {
+        int count = 0;
+        for (byte[] array : arrays) {
+            count += array.length;
+        }
+
+        // Create new array and copy all array contents
+        byte[] mergedArray = new byte[count];
+        int start = 0;
+        for (byte[] array : arrays) {
+            System.arraycopy(array, 0, mergedArray, start, array.length);
+            start += array.length;
+        }
+        return mergedArray;
+    }
+
+    public static boolean isNullOrZeroArray(byte[] array) {
+        return (array == null) || (array.length == 0);
+    }
+
+    public static boolean isSingleZero(byte[] array) {
+        return (array.length == 1 && array[0] == 0);
+    }
+
+    public static Set<byte[]> difference(Set<byte[]> setA, Set<byte[]> setB) {
+
+        Set<byte[]> result = new HashSet<>();
+
+        for (byte[] elementA : setA) {
+            boolean found = false;
+            for (byte[] elementB : setB) {
+
+                if (Arrays.equals(elementA, elementB)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                result.add(elementA);
+            }
+        }
+
+        return result;
+    }
+
+    public static int length(byte[]... bytes) {
+        int result = 0;
+        for (byte[] array : bytes) {
+            result += (array == null) ? 0 : array.length;
+        }
+        return result;
+    }
+
+    public static byte[] intsToBytes(int[] arr, boolean bigEndian) {
+        byte[] ret = new byte[arr.length * 4];
+        intsToBytes(arr, ret, bigEndian);
+        return ret;
+    }
+
+    public static int[] bytesToInts(byte[] arr, boolean bigEndian) {
+        int[] ret = new int[arr.length / 4];
+        bytesToInts(arr, ret, bigEndian);
+        return ret;
+    }
+
+    public static void bytesToInts(byte[] b, int[] arr, boolean bigEndian) {
+        if (!bigEndian) {
+            int off = 0;
+            for (int i = 0; i < arr.length; i++) {
+                int ii = b[off++] & 0x000000FF;
+                ii |= (b[off++] << 8) & 0x0000FF00;
+                ii |= (b[off++] << 16) & 0x00FF0000;
+                ii |= (b[off++] << 24);
+                arr[i] = ii;
+            }
+        } else {
+            int off = 0;
+            for (int i = 0; i < arr.length; i++) {
+                int ii = b[off++] << 24;
+                ii |= (b[off++] << 16) & 0x00FF0000;
+                ii |= (b[off++] << 8) & 0x0000FF00;
+                ii |= b[off++] & 0x000000FF;
+                arr[i] = ii;
+            }
+        }
+    }
+
+    public static void intsToBytes(int[] arr, byte[] b, boolean bigEndian) {
+        if (!bigEndian) {
+            int off = 0;
+            for (int i = 0; i < arr.length; i++) {
+                int ii = arr[i];
+                b[off++] = (byte) (ii & 0xFF);
+                b[off++] = (byte) ((ii >> 8) & 0xFF);
+                b[off++] = (byte) ((ii >> 16) & 0xFF);
+                b[off++] = (byte) ((ii >> 24) & 0xFF);
+            }
+        } else {
+            int off = 0;
+            for (int i = 0; i < arr.length; i++) {
+                int ii = arr[i];
+                b[off++] = (byte) ((ii >> 24) & 0xFF);
+                b[off++] = (byte) ((ii >> 16) & 0xFF);
+                b[off++] = (byte) ((ii >> 8) & 0xFF);
+                b[off++] = (byte) (ii & 0xFF);
+            }
+        }
+    }
+
+    public static short bigEndianToShort(byte[] bs) {
+        return bigEndianToShort(bs, 0);
+    }
+
+    public static short bigEndianToShort(byte[] bs, int off) {
+        int n = bs[off] << 8;
+        ++off;
+        n |= bs[off] & 0xFF;
+        return (short) n;
+    }
+
+    public static byte[] shortToBytes(short n) {
+        return ByteBuffer.allocate(2).putShort(n).array();
+    }
+
+    /**
+     * Converts string hex representation to data bytes Accepts following hex: - with or without 0x
+     * prefix - with no leading 0, like 0xabc -> 0x0abc
+     *
+     * @param data String like '0xa5e..' or just 'a5e..'
+     * @return decoded bytes array
+     */
+    public static byte[] hexStringToBytes(String data) {
+        if (data == null) {
+            return EMPTY_BYTE_ARRAY;
+        }
+        if (data.startsWith("0x")) {
+            data = data.substring(2);
+        }
+        if (data.length() % 2 == 1) {
+            data = "0" + data;
+        }
+        return Hex.decode(data);
+    }
+
+    /**
+     * Chops a 32-byte value into a 16-byte value. Keep in mind the subtlety that a "chopped"
+     * bytearray is a different reference from a "unchopped" bytearray, so make no assummptions as
+     * to whether this function news the element.
+     *
+     * @return 16-byte value representing the LOWER portion of the original
+     */
+    public static byte[] chop(byte[] in) {
+        if (in.length <= 16) {
+            return in;
+        }
+        return Arrays.copyOfRange(in, in.length - 16, in.length);
+    }
+}
diff --git a/modUtil/src/org/aion/util/conversions/Hex.java b/modUtil/src/org/aion/util/conversions/Hex.java
new file mode 100644
index 0000000000..e50e0152da
--- /dev/null
+++ b/modUtil/src/org/aion/util/conversions/Hex.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2017-2018 Aion foundation.
+ *
+ *     This file is part of the aion network project.
+ *
+ *     The aion network project 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 any later version.
+ *
+ *     The aion network project 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 the aion network project source files.
+ *     If not, see <https://www.gnu.org/licenses/>.
+ *
+ *     The aion network project leverages useful source code from other
+ *     open source projects. We greatly appreciate the effort that was
+ *     invested in these projects and we thank the individual contributors
+ *     for their work. For provenance information and contributors
+ *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
+ *
+ * Contributors to the aion source files in decreasing order of code volume:
+ *     Aion foundation.
+ *     <ether.camp> team through the ethereumJ library.
+ *     Ether.Camp Inc. (US) team through Ethereum Harmony.
+ *     John Tromp through the Equihash solver.
+ *     Samuel Neves through the BLAKE2 implementation.
+ *     Zcash project team.
+ *     Bitcoinj team.
+ */
+
+package org.aion.util.conversions;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/** Utility class for converting hex data to bytes and back again. */
+public class Hex {
+
+    private static final HexEncoder encoder = new HexEncoder();
+
+    public static String toHexString(byte[] data) {
+        return toHexString(data, 0, data.length);
+    }
+
+    public static String toHexString(byte[] data, int off, int length) {
+        byte[] encoded = encode(data, off, length);
+        return new String(encoded);
+    }
+
+    /**
+     * encode the input data producing a Hex encoded byte array.
+     *
+     * @return a byte array containing the Hex encoded data.
+     */
+    public static byte[] encode(byte[] data) {
+        return encode(data, 0, data.length);
+    }
+
+    /**
+     * encode the input data producing a Hex encoded byte array.
+     *
+     * @return a byte array containing the Hex encoded data.
+     */
+    public static byte[] encode(byte[] data, int off, int length) {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+
+        encoder.encode(data, off, length, bOut);
+
+        return bOut.toByteArray();
+    }
+
+    /**
+     * Hex encode the byte data writing it to the given output stream.
+     *
+     * @return the number of bytes produced.
+     */
+    public static int encode(byte[] data, OutputStream out) throws IOException {
+        return encoder.encode(data, 0, data.length, out);
+    }
+
+    /**
+     * Hex encode the byte data writing it to the given output stream.
+     *
+     * @return the number of bytes produced.
+     */
+    public static int encode(byte[] data, int off, int length, OutputStream out)
+            throws IOException {
+        return encoder.encode(data, off, length, out);
+    }
+
+    /**
+     * decode the Hex encoded input data. It is assumed the input data is valid.
+     *
+     * @return a byte array representing the decoded data.
+     */
+    public static byte[] decode(byte[] data) {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        try {
+            encoder.decode(data, 0, data.length, bOut);
+        } catch (IOException e) {
+            System.err.println("Hex decode failed! " + data);
+            return null;
+        }
+
+        return bOut.toByteArray();
+    }
+
+    /**
+     * decode the Hex encoded String data - whitespace will be ignored.
+     *
+     * @return a byte array representing the decoded data.
+     */
+    public static byte[] decode(String data) {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        try {
+            encoder.decode(data, bOut);
+        } catch (IOException e) {
+            System.err.println("Hex decode failed! " + data);
+            return null;
+        }
+        return bOut.toByteArray();
+    }
+
+    /**
+     * decode the Hex encoded String data writing it to the given output stream, whitespace
+     * characters will be ignored.
+     *
+     * @return the number of bytes produced.
+     */
+    public static int decode(String data, OutputStream out) throws IOException {
+        return encoder.decode(data, out);
+    }
+}
diff --git a/modUtil/src/org/aion/util/conversions/HexEncoder.java b/modUtil/src/org/aion/util/conversions/HexEncoder.java
new file mode 100644
index 0000000000..61380d5c5c
--- /dev/null
+++ b/modUtil/src/org/aion/util/conversions/HexEncoder.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2017-2018 Aion foundation.
+ *
+ *     This file is part of the aion network project.
+ *
+ *     The aion network project 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 any later version.
+ *
+ *     The aion network project 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 the aion network project source files.
+ *     If not, see <https://www.gnu.org/licenses/>.
+ *
+ *     The aion network project leverages useful source code from other
+ *     open source projects. We greatly appreciate the effort that was
+ *     invested in these projects and we thank the individual contributors
+ *     for their work. For provenance information and contributors
+ *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
+ *
+ * Contributors to the aion source files in decreasing order of code volume:
+ *     Aion foundation.
+ *     <ether.camp> team through the ethereumJ library.
+ *     Ether.Camp Inc. (US) team through Ethereum Harmony.
+ *     John Tromp through the Equihash solver.
+ *     Samuel Neves through the BLAKE2 implementation.
+ *     Zcash project team.
+ *     Bitcoinj team.
+ */
+
+package org.aion.util.conversions;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/** A streaming Hex encoder. */
+public class HexEncoder {
+
+    protected final byte[] encodingTable = {
+        (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6',
+                (byte) '7',
+        (byte) '8', (byte) '9', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e',
+                (byte) 'f'
+    };
+
+    /*
+     * set up the decoding table.
+     */
+    protected final byte[] decodingTable = new byte[128];
+
+    protected void initialiseDecodingTable() {
+        for (int i = 0; i < decodingTable.length; i++) {
+            decodingTable[i] = (byte) 0xff;
+        }
+
+        for (int i = 0; i < encodingTable.length; i++) {
+            decodingTable[encodingTable[i]] = (byte) i;
+        }
+
+        decodingTable['A'] = decodingTable['a'];
+        decodingTable['B'] = decodingTable['b'];
+        decodingTable['C'] = decodingTable['c'];
+        decodingTable['D'] = decodingTable['d'];
+        decodingTable['E'] = decodingTable['e'];
+        decodingTable['F'] = decodingTable['f'];
+    }
+
+    public HexEncoder() {
+        initialiseDecodingTable();
+    }
+
+    /**
+     * encode the input data producing a Hex output stream.
+     *
+     * @return the number of bytes produced.
+     */
+    public int encode(byte[] data, int off, int length, OutputStream out) {
+        for (int i = off; i < (off + length); i++) {
+            int v = data[i] & 0xff;
+            try {
+                out.write(encodingTable[(v >>> 4)]);
+                out.write(encodingTable[v & 0xf]);
+            } catch (Exception e) {
+            }
+        }
+
+        return length * 2;
+    }
+
+    private static boolean ignore(char c) {
+        return c == '\n' || c == '\r' || c == '\t' || c == ' ';
+    }
+
+    /**
+     * decode the Hex encoded byte data writing it to the given output stream, whitespace characters
+     * will be ignored.
+     *
+     * @return the number of bytes produced.
+     */
+    public int decode(byte[] data, int off, int length, OutputStream out) throws IOException {
+        byte b1, b2;
+        int outLen = 0;
+
+        int end = off + length;
+
+        while (end > off) {
+            if (!ignore((char) data[end - 1])) {
+                break;
+            }
+
+            end--;
+        }
+
+        int i = off;
+        while (i < end) {
+            while (i < end && ignore((char) data[i])) {
+                i++;
+            }
+
+            b1 = decodingTable[data[i++]];
+
+            while (i < end && ignore((char) data[i])) {
+                i++;
+            }
+
+            b2 = decodingTable[data[i++]];
+
+            if ((b1 | b2) < 0) {
+                throw new IOException("invalid characters encountered in Hex data");
+            }
+
+            try {
+                out.write((b1 << 4) | b2);
+            } catch (Exception e) {
+
+            }
+
+            outLen++;
+        }
+
+        return outLen;
+    }
+
+    /**
+     * decode the Hex encoded String data writing it to the given output stream, whitespace
+     * characters will be ignored.
+     *
+     * @return the number of bytes produced.
+     */
+    public int decode(String data, OutputStream out) throws IOException {
+        byte b1, b2;
+        int length = 0;
+
+        int end = data.length();
+
+        while (end > 0) {
+            if (!ignore(data.charAt(end - 1))) {
+                break;
+            }
+
+            end--;
+        }
+
+        int i = 0;
+        while (i < end) {
+            while (i < end && ignore(data.charAt(i))) {
+                i++;
+            }
+
+            b1 = decodingTable[data.charAt(i++)];
+
+            while (i < end && ignore(data.charAt(i))) {
+                i++;
+            }
+
+            b2 = decodingTable[data.charAt(i++)];
+
+            if ((b1 | b2) < 0) {
+                throw new IOException("invalid characters encountered in Hex string");
+            }
+
+            out.write((b1 << 4) | b2);
+
+            length++;
+        }
+
+        return length;
+    }
+}
diff --git a/modUtil/test/org/aion/util/bytes/ByteUtilTest.java b/modUtil/test/org/aion/util/bytes/ByteUtilTest.java
new file mode 100644
index 0000000000..ee094b6d81
--- /dev/null
+++ b/modUtil/test/org/aion/util/bytes/ByteUtilTest.java
@@ -0,0 +1,468 @@
+/*
+ * Copyright (c) 2017-2018 Aion foundation.
+ *
+ *     This file is part of the aion network project.
+ *
+ *     The aion network project 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 any later version.
+ *
+ *     The aion network project 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 the aion network project source files.
+ *     If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Contributors:
+ *     Aion foundation.
+ */
+
+package org.aion.util.bytes;
+
+import static org.aion.util.bytes.ByteUtil.and;
+import static org.aion.util.bytes.ByteUtil.appendByte;
+import static org.aion.util.bytes.ByteUtil.bigEndianToShort;
+import static org.aion.util.bytes.ByteUtil.bigIntegerToBytes;
+import static org.aion.util.bytes.ByteUtil.bigIntegerToBytesSigned;
+import static org.aion.util.bytes.ByteUtil.byteArrayToInt;
+import static org.aion.util.bytes.ByteUtil.byteArrayToLong;
+import static org.aion.util.bytes.ByteUtil.bytesToBigInteger;
+import static org.aion.util.bytes.ByteUtil.copyToArray;
+import static org.aion.util.bytes.ByteUtil.encodeValFor32Bits;
+import static org.aion.util.bytes.ByteUtil.firstNonZeroByte;
+import static org.aion.util.bytes.ByteUtil.getBit;
+import static org.aion.util.bytes.ByteUtil.hexStringToBytes;
+import static org.aion.util.bytes.ByteUtil.increment;
+import static org.aion.util.bytes.ByteUtil.intToBytes;
+import static org.aion.util.bytes.ByteUtil.intToBytesBE;
+import static org.aion.util.bytes.ByteUtil.intToBytesLE;
+import static org.aion.util.bytes.ByteUtil.intToBytesNoLeadZeroes;
+import static org.aion.util.bytes.ByteUtil.isNullOrZeroArray;
+import static org.aion.util.bytes.ByteUtil.isSingleZero;
+import static org.aion.util.bytes.ByteUtil.length;
+import static org.aion.util.bytes.ByteUtil.longToBytes;
+import static org.aion.util.bytes.ByteUtil.longToBytesLE;
+import static org.aion.util.bytes.ByteUtil.longToBytesNoLeadZeroes;
+import static org.aion.util.bytes.ByteUtil.numBytes;
+import static org.aion.util.bytes.ByteUtil.oneByteToHexString;
+import static org.aion.util.bytes.ByteUtil.or;
+import static org.aion.util.bytes.ByteUtil.setBit;
+import static org.aion.util.bytes.ByteUtil.shortToBytes;
+import static org.aion.util.bytes.ByteUtil.stripLeadingZeroes;
+import static org.aion.util.bytes.ByteUtil.toByte;
+import static org.aion.util.bytes.ByteUtil.toHexString;
+import static org.aion.util.bytes.ByteUtil.toHexStringWithPrefix;
+import static org.aion.util.bytes.ByteUtil.toLEByteArray;
+import static org.aion.util.bytes.ByteUtil.xor;
+import static org.aion.util.bytes.ByteUtil.xorAlignRight;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitParamsRunner.class)
+public class ByteUtilTest {
+
+    private static final Random random = new Random();
+
+    private final String[] testHex = {
+        null, // 0 - Null
+        "", // 1 - Empty
+        "eF", // 2 - One Byte
+        "aA11bB22cC33dd44aA11bB22cC33dd44aA11bB22cC33dd44aA11bB22cC33dd44", // 3 - Upper/Lower
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", // 4 - Negative (-1)
+        "0000000000000000000000000000000000000000000000000000000000000000", // 5 - Zeroes
+        "0000000000000000000000000000000000000000000000000000000000000001", // 6 - Positive (+1)
+    }; // 1byte
+
+    private final byte[][] testByte = {
+        null,
+        hexStringToBytes(testHex[1]),
+        hexStringToBytes(testHex[2]),
+        hexStringToBytes(testHex[3]),
+        hexStringToBytes(testHex[4]),
+        hexStringToBytes(testHex[5]),
+        hexStringToBytes(testHex[6]),
+    };
+
+    private final String[][] testNum = {
+        {null, null},
+        {"-00000000000000000000", "00000000000000000000"},
+        {"-00000000000000000001", "00000000000000000001"},
+        {"-10000000000000000000", "10000000000000000000"},
+        {"-20000000000000000000", "20000000000000000000"},
+        {"-30000000000000000000", "30000000000000000000"},
+        {"-99999999999999999999", "99999999999999999999"},
+    };
+
+    private final BigInteger[][] testBigInt = {
+        {null, null},
+        {new BigInteger(testNum[1][0]), new BigInteger(testNum[1][1])},
+        {new BigInteger(testNum[2][0]), new BigInteger(testNum[2][1])},
+        {new BigInteger(testNum[3][0]), new BigInteger(testNum[3][1])},
+        {new BigInteger(testNum[4][0]), new BigInteger(testNum[4][1])},
+        {new BigInteger(testNum[5][0]), new BigInteger(testNum[5][1])},
+        {new BigInteger(testNum[6][0]), new BigInteger(testNum[6][1])},
+    };
+
+    /** @return input values for {@link #longTest(long)} */
+    @SuppressWarnings("unused")
+    private Object longValues() {
+
+        List<Object> parameters = new ArrayList<>();
+
+        // longs similar to integer values
+        parameters.add(0L);
+        parameters.add(1L);
+        parameters.add(10L);
+        parameters.add((long) random.nextInt(Integer.MAX_VALUE));
+        parameters.add((long) Integer.MAX_VALUE);
+
+        // additional long values
+        parameters.add((long) Integer.MAX_VALUE + random.nextInt(Integer.MAX_VALUE));
+        parameters.add(10L * (long) Integer.MAX_VALUE);
+        parameters.add(Long.MAX_VALUE - 1L);
+
+        return parameters.toArray();
+    }
+
+    /** @return input values for {@link #intTest(int)} */
+    @SuppressWarnings("unused")
+    private Object intValues() {
+
+        List<Object> parameters = new ArrayList<>();
+
+        // integer values
+        parameters.add(0);
+        parameters.add(1);
+        parameters.add(10);
+        parameters.add(15);
+        parameters.add(20);
+        parameters.add(random.nextInt(Integer.MAX_VALUE));
+        parameters.add(Integer.MAX_VALUE);
+
+        return parameters.toArray();
+    }
+
+    /** @return input values for {@link #shortTest(short)} */
+    @SuppressWarnings("unused")
+    private Object shortValues() {
+
+        Short[] temp = {
+            0, 1, 10, 15, 20, (short) random.nextInt(Integer.MAX_VALUE), (short) Integer.MAX_VALUE
+        };
+
+        return temp;
+    }
+
+    /**
+     * TEST: BI <--> Bytes (+ve) bigIntegerToBytes(BI) bigIntegerToBytes(BI, num)
+     * bigIntegerToBytesSigned(BI, num) bytesToBigInteger(byte) {@link #intValues()}.
+     */
+    @Test
+    public void bigIntegerTest() {
+        for (int b = 1; b < 2; b++) {
+            for (int a = 0; a < testBigInt.length; a++) {
+                try {
+                    byte[] temp1 = bigIntegerToBytes(testBigInt[a][b]);
+                    byte[] temp2 = bigIntegerToBytes(testBigInt[a][b], temp1.length);
+                    byte[] temp3 = bigIntegerToBytesSigned(testBigInt[a][b], temp1.length);
+                    byte[] temp4 = encodeValFor32Bits(testNum[a][b]);
+
+                    assertEquals(testBigInt[a][b], bytesToBigInteger(temp1));
+                    assertEquals(testBigInt[a][b], bytesToBigInteger(temp2));
+                    assertEquals(testBigInt[a][b], bytesToBigInteger(temp3));
+                    assertEquals(bytesToBigInteger(temp1), bytesToBigInteger(temp4));
+                } catch (NullPointerException e) {
+                    System.out.println(b + " " + a);
+                    System.out.println("\nNull Big Integer Test!");
+                }
+            }
+        }
+    }
+
+    // TODO: Object --> Bytes
+    // encodeValFor32Bits(Object)
+    // encodeDataList(Object)
+    @Test
+    public void objectTest() {
+        for (int a = 0; a < testNum.length; a++) {
+            try {
+                byte[] temp1 = encodeValFor32Bits(testNum[a][1]);
+            } catch (NullPointerException e) {
+                System.out.println("\nNull Object Test!");
+            }
+        }
+    }
+
+    /** TEST: hex <--> Bytes hexStringToBytes(hex) toHexString(byte) toHexStringWithPrefix(byte) */
+    @Test
+    public void hexTest() {
+        byte[] temp0 = hexStringToBytes(testHex[0]);
+        assertEquals("", toHexString(temp0));
+        assertEquals("0x", toHexStringWithPrefix(temp0));
+
+        for (int a = 1; a < testHex.length; a++) {
+            byte[] temp1 = hexStringToBytes(testHex[a]);
+            assertEquals(testHex[a].toLowerCase(), toHexString(temp1));
+            assertEquals("0x" + testHex[a].toLowerCase(), toHexStringWithPrefix(temp1));
+        }
+    }
+
+    /**
+     * TEST: long <--> Bytes longToBytes(long) longToBytesNoLeadZeroes(long) byteArrayToLong(byte)
+     * longToBytesLE(long)
+     */
+    @Test
+    @Parameters(method = "longValues")
+    public void longTest(long testLong) {
+
+        byte[] temp1 = longToBytes(testLong);
+        byte[] temp2 = longToBytesNoLeadZeroes(testLong);
+        byte[] temp3 = longToBytesLE(testLong);
+
+        toLEByteArray(temp3);
+
+        assertEquals(testLong, byteArrayToLong(temp1));
+        assertEquals(testLong, byteArrayToLong(temp2));
+        assertEquals(testLong, byteArrayToLong(temp3));
+    }
+
+    /**
+     * TEST: short <--> Bytes shortToBytes(short) bigEndianToShort(byte) ~ bigEndianToShort(byte,
+     * offset)
+     */
+    @Test
+    @Parameters(method = "shortValues")
+    public void shortTest(short testShort) {
+        byte[] temp1 = shortToBytes(testShort);
+        assertEquals(testShort, bigEndianToShort(temp1));
+    }
+
+    /**
+     * TEST: int <--> Bytes intToBytes(int) intToBytesLE(int) intToBytesBE(int)
+     * intToBytesNoLeadZeroes(int) byteArrayToInt(byte) ~ intsToBytes(array, BE) ~
+     * intsToBytes(array, byte, BE) ~ bytesToInts(byte, BE) ~ bytesToInts(byte, array, BE)
+     */
+    @Test
+    @Parameters(method = "intValues")
+    public void intTest(int testInt) {
+
+        byte[] temp1 = intToBytes(testInt);
+        byte[] temp2 = intToBytesLE(testInt);
+        byte[] temp3 = intToBytesBE(testInt);
+        byte[] temp4 = intToBytesNoLeadZeroes(testInt);
+
+        toLEByteArray(temp2);
+
+        assertEquals(testInt, byteArrayToInt(temp1));
+        assertEquals(testInt, byteArrayToInt(temp2));
+        assertEquals(testInt, byteArrayToInt(temp3));
+        assertEquals(testInt, byteArrayToInt(temp4));
+    }
+
+    /**
+     * TEST: Byte validation toByte(byte) toLEByteArray(byte) firstNonZeroByte(byte) numBytes(hex)
+     * isNullOrZeroArray(byte) isSingleZero(byte) length(byte) stripLeadingZeroes(byte)
+     * appendByte(byte1, byte2) oneByteToHexString(byte) ~ matchingNibbleLength(byte1, byte2) ~
+     * nibblesToPrettyString(byte) ~ difference(byteSet1, byteSet2)
+     */
+    @Test
+    public void byteTest() {
+
+        // Single 'zero' byte
+        String singleZero = "0";
+        byte[] temp = bigIntegerToBytes(new BigInteger(singleZero));
+        assertEquals(-1, firstNonZeroByte(temp));
+        assertEquals(1, numBytes(singleZero));
+        assertEquals(1, length(temp));
+        assertFalse(isNullOrZeroArray(temp));
+        assertTrue(isSingleZero(temp));
+
+        // Null Variable
+        byte[] temp0 = bigIntegerToBytes(new BigInteger(singleZero));
+        assertEquals(-1, firstNonZeroByte(temp0));
+        assertTrue(isNullOrZeroArray(testByte[0]));
+        assertNull(stripLeadingZeroes(testByte[0]));
+
+        // Empty Array
+        byte[] temp1 = stripLeadingZeroes(testByte[1]);
+        assertEquals(-1, firstNonZeroByte(temp1));
+        assertEquals(-1, firstNonZeroByte(testByte[1]));
+        assertTrue(isNullOrZeroArray(testByte[1]));
+
+        // Leading Non-zero
+        byte[] temp2 = stripLeadingZeroes(testByte[2]);
+        assertEquals(0, firstNonZeroByte(temp2));
+        assertEquals(0, firstNonZeroByte(testByte[2]));
+        assertEquals(0, firstNonZeroByte(testByte[3]));
+        assertEquals(0, firstNonZeroByte(testByte[4]));
+
+        // Only Zeroes
+        assertEquals(-1, firstNonZeroByte(testByte[5]));
+        assertFalse(isNullOrZeroArray(testByte[5]));
+        assertFalse(isSingleZero(testByte[5]));
+
+        // Leading Zeroes
+        byte[] temp3 = stripLeadingZeroes(testByte[6]);
+        assertEquals(0, firstNonZeroByte(temp3));
+        assertEquals(31, firstNonZeroByte(testByte[6]));
+
+        // n Byte = { 2n Hex || (256^n) - 1 }
+        assertEquals(1, numBytes("255"));
+        assertEquals(2, numBytes("65535"));
+        assertEquals(3, numBytes("16777215"));
+        assertEquals(4, numBytes("4294967295"));
+        assertEquals(5, numBytes("1099511627775"));
+
+        // TFAE (+ve);
+        // 1) numBytes(number)
+        // 2) bigInt.length
+        // 3) hex.length()/2
+        for (int a = 1; a < testBigInt.length; a++) {
+            byte[] temp4 = bigIntegerToBytes(testBigInt[a][1]);
+            String temp5 = toHexString(temp4);
+            assertEquals(temp5.length() / 2, temp4.length);
+            assertEquals(temp5.length() / 2, numBytes(testNum[a][1]));
+        }
+
+        // Append
+        for (int a = 0; a < testHex.length; a++) {
+            byte[] temp6 = hexStringToBytes(testHex[a]);
+            byte temp7 = toByte(testByte[2]);
+            byte[] temp8 = appendByte(temp6, temp7);
+            String temp9 = oneByteToHexString(temp7);
+            assertEquals(testHex[2].toLowerCase(), temp9);
+            assertEquals(toHexString(temp6) + temp9, toHexString(temp8));
+        }
+    }
+
+    /**
+     * TEST: Bit manipulation increment(byte) copyToArray(byte) setBit(byte, pos, val) getBit(byte,
+     * pos) and(byte1, byte2) or(byte1, byte2) xor(byte1, byte2) xorAlignRight(byte1, byte2)
+     */
+    @Test
+    public void bitTest() {
+
+        // Increment for all byte size (+ve)
+        int increment = 123;
+        boolean max = false;
+        for (int a = 1; a < testBigInt.length; a++) {
+
+            BigInteger temp1 = testBigInt[a][1];
+            byte[] temp2 = bigIntegerToBytes(temp1);
+            BigInteger capacity = BigInteger.valueOf((long) Math.pow(255, temp2.length));
+
+            for (int i = 0; i < increment; i++) {
+                while (!max) {
+                    max = increment(temp2);
+                }
+                temp1 = bytesToBigInteger(temp2);
+                max = false;
+            }
+
+            BigInteger temp3 = BigInteger.valueOf(increment).mod(capacity);
+            BigInteger temp4 = testBigInt[a][1].add(temp3);
+            assertEquals(temp4, temp1);
+        }
+
+        // Copy array, convert and assert (+ve)
+        for (int a = 1; a < testBigInt.length; a++) {
+            byte[] temp5 = copyToArray(testBigInt[a][1]);
+            BigInteger temp6 = bytesToBigInteger(temp5);
+            assertEquals(testBigInt[a][1], temp6);
+        }
+
+        // Set bit, get bit for every bit
+        int shifts = 8;
+        for (int c = 0; c < shifts; c++) {
+            byte[] temp6 = bigIntegerToBytesSigned(testBigInt[1][1], 1);
+            setBit(temp6, c, 1);
+            assertEquals(1, getBit(temp6, c));
+            assertEquals(BigInteger.valueOf((long) Math.pow(2, c)), bytesToBigInteger(temp6));
+        }
+
+        // AND + OR with zero (+ve)
+        for (int a = 2; a < testBigInt.length; a++) {
+            byte[] temp8 = bigIntegerToBytes(testBigInt[a][1]);
+            byte[] temp9 = bigIntegerToBytes(testBigInt[1][1], temp8.length);
+            byte[] temp10 = or(temp8, temp9);
+            byte[] temp11 = and(temp8, temp9);
+            assertEquals(testBigInt[a][1], bytesToBigInteger(temp10));
+            assertEquals(testBigInt[1][1], bytesToBigInteger(temp11));
+            System.out.println(
+                    testBigInt[a][1]
+                            + " || "
+                            + testBigInt[1][1]
+                            + " --> "
+                            + bytesToBigInteger(temp10));
+            System.out.println(
+                    testBigInt[a][1]
+                            + " && "
+                            + testBigInt[1][1]
+                            + " --> "
+                            + bytesToBigInteger(temp11));
+        }
+
+        // 2's compliment -ve BI --> +ve BI
+        for (int a = 1; a < testBigInt.length; a++) {
+            boolean found = false;
+            int rightMost = 0;
+            byte[] temp7 = bigIntegerToBytes(testBigInt[a][0]);
+            while (!found && rightMost < temp7.length * 8) {
+                if (getBit(temp7, rightMost) == 1) {
+                    found = true;
+                } else {
+                    rightMost++;
+                }
+            }
+            if (found) {
+                for (int b = rightMost + 1; b < temp7.length * 8; b++) {
+                    if (getBit(temp7, b) == 0) {
+                        setBit(temp7, b, 1);
+                    } else if (getBit(temp7, b) == 1) {
+                        setBit(temp7, b, 0);
+                    }
+                }
+            }
+            assertEquals(testBigInt[a][1], bytesToBigInteger(temp7));
+            System.out.println(testBigInt[a][0] + " --> " + bytesToBigInteger(temp7));
+        }
+
+        // 1's compliment | XOR with "FF" * numBytes
+        for (int b = 0; b < 2; b++) {
+            for (int a = 1; a < testBigInt.length; a++) {
+                byte[] temp12 = bigIntegerToBytes(testBigInt[a][b]);
+                StringBuilder allForOne = new StringBuilder();
+                for (int i = 0; i < temp12.length; i++) {
+                    allForOne.append("FF");
+                }
+                byte[] temp13 = hexStringToBytes(allForOne.toString());
+                byte[] temp14 = xor(temp13, temp12);
+                byte[] temp15 = xorAlignRight(temp13, temp12);
+                for (int c = 0; c < temp12.length * 8; c++) {
+                    if (getBit(temp12, c) == 0) {
+                        setBit(temp12, c, 1);
+                    } else if (getBit(temp12, c) == 1) {
+                        setBit(temp12, c, 0);
+                    }
+                }
+                assertEquals(bytesToBigInteger(temp14), bytesToBigInteger(temp12));
+                assertEquals(bytesToBigInteger(temp15), bytesToBigInteger(temp12));
+            }
+        }
+    }
+}
diff --git a/modVM/src/org/aion/vm/AbstractExecutionResult.java b/modVM/src/org/aion/vm/AbstractExecutionResult.java
index 85f16a75b5..1ee579c50e 100644
--- a/modVM/src/org/aion/vm/AbstractExecutionResult.java
+++ b/modVM/src/org/aion/vm/AbstractExecutionResult.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.vm;
 
 import org.aion.base.type.IExecutionResult;
diff --git a/modVM/src/org/aion/vm/AbstractExecutor.java b/modVM/src/org/aion/vm/AbstractExecutor.java
index c933fb6c84..9b04a94ad8 100644
--- a/modVM/src/org/aion/vm/AbstractExecutor.java
+++ b/modVM/src/org/aion/vm/AbstractExecutor.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.vm;
 
 import static org.aion.mcf.valid.TxNrgRule.isValidNrgContractCreate;
diff --git a/modVM/src/org/aion/vm/ExecutionContext.java b/modVM/src/org/aion/vm/ExecutionContext.java
index ea7a66d43f..150ad6f1d6 100644
--- a/modVM/src/org/aion/vm/ExecutionContext.java
+++ b/modVM/src/org/aion/vm/ExecutionContext.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.vm;
 
 import java.nio.ByteBuffer;
diff --git a/modVM/src/org/aion/vm/ExecutionHelper.java b/modVM/src/org/aion/vm/ExecutionHelper.java
index 3b67b41dd4..5dd7c5bcd2 100644
--- a/modVM/src/org/aion/vm/ExecutionHelper.java
+++ b/modVM/src/org/aion/vm/ExecutionHelper.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.vm;
 
 import java.util.ArrayList;
diff --git a/modVM/src/org/aion/vm/ExecutionResult.java b/modVM/src/org/aion/vm/ExecutionResult.java
index e5caa59408..54b84802ae 100644
--- a/modVM/src/org/aion/vm/ExecutionResult.java
+++ b/modVM/src/org/aion/vm/ExecutionResult.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.vm;
 
 import java.nio.ByteBuffer;
diff --git a/modVM/src/org/aion/vm/ExecutorProvider.java b/modVM/src/org/aion/vm/ExecutorProvider.java
index cf9c644f74..4b89c072a8 100644
--- a/modVM/src/org/aion/vm/ExecutorProvider.java
+++ b/modVM/src/org/aion/vm/ExecutorProvider.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.vm;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modVM/src/org/aion/vm/Forks.java b/modVM/src/org/aion/vm/Forks.java
index 9e45480dc9..4a5acd94b0 100644
--- a/modVM/src/org/aion/vm/Forks.java
+++ b/modVM/src/org/aion/vm/Forks.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.vm;
 
 public class Forks {}
diff --git a/modVM/src/org/aion/vm/IContractFactory.java b/modVM/src/org/aion/vm/IContractFactory.java
index 3b7b0cd06c..b35f25c2e3 100644
--- a/modVM/src/org/aion/vm/IContractFactory.java
+++ b/modVM/src/org/aion/vm/IContractFactory.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
-
 package org.aion.vm;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/modVM/src/org/aion/vm/IPrecompiledContract.java b/modVM/src/org/aion/vm/IPrecompiledContract.java
index f855a21a6d..ececde0343 100644
--- a/modVM/src/org/aion/vm/IPrecompiledContract.java
+++ b/modVM/src/org/aion/vm/IPrecompiledContract.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.vm;
 
 import org.aion.base.type.IExecutionResult;
diff --git a/modVM/src/org/aion/vm/TransactionExecutor.java b/modVM/src/org/aion/vm/TransactionExecutor.java
index db246a1aa8..47469aac6d 100644
--- a/modVM/src/org/aion/vm/TransactionExecutor.java
+++ b/modVM/src/org/aion/vm/TransactionExecutor.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.vm;
 
 import java.math.BigInteger;
diff --git a/modVM/src/org/aion/vm/TransactionResult.java b/modVM/src/org/aion/vm/TransactionResult.java
index 48e2f3616c..7defdf6173 100644
--- a/modVM/src/org/aion/vm/TransactionResult.java
+++ b/modVM/src/org/aion/vm/TransactionResult.java
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- * Contributors:
- *     Aion foundation.
- */
 package org.aion.vm;
 
 import java.util.ArrayList;
diff --git a/modVM/src/org/aion/vm/VirtualMachine.java b/modVM/src/org/aion/vm/VirtualMachine.java
index 44d29f4ff0..0904a1d587 100644
--- a/modVM/src/org/aion/vm/VirtualMachine.java
+++ b/modVM/src/org/aion/vm/VirtualMachine.java
@@ -1,38 +1,3 @@
-/*
- * Copyright (c) 2017-2018 Aion foundation.
- *
- *     This file is part of the aion network project.
- *
- *     The aion network project 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 any later version.
- *
- *     The aion network project 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 the aion network project source files.
- *     If not, see <https://www.gnu.org/licenses/>.
- *
- *     The aion network project leverages useful source code from other
- *     open source projects. We greatly appreciate the effort that was
- *     invested in these projects and we thank the individual contributors
- *     for their work. For provenance information and contributors
- *     please see <https://github.com/aionnetwork/aion/wiki/Contributors>.
- *
- * Contributors to the aion source files in decreasing order of code volume:
- *     Aion foundation.
- *     <ether.camp> team through the ethereumJ library.
- *     Ether.Camp Inc. (US) team through Ethereum Harmony.
- *     John Tromp through the Equihash solver.
- *     Samuel Neves through the BLAKE2 implementation.
- *     Zcash project team.
- *     Bitcoinj team.
- */
-
 package org.aion.vm;
 
 import org.aion.base.db.IRepositoryCache;
diff --git a/script/prepack.sh b/script/prepack.sh
index b5bce569e2..c5bc3f872f 100755
--- a/script/prepack.sh
+++ b/script/prepack.sh
@@ -10,8 +10,8 @@ API_PATH="${PACK_PATH}/clientAPI"
 SCRIPT_PATH="${PACK_PATH}/script"
 JDK_VER="11.0.1"
 JDK_TYPE="openjdk"
-JAVAFX_PATH="${PACK_PATH}/javafx"
-JAVAFX_VER="javafx-jmods-11"
+#JAVAFX_PATH="${PACK_PATH}/javafx"
+#JAVAFX_VER="javafx-jmods-11"
 DEFAULT_NETWORK="mainnet"
 
 if [ ! -d "$PACK_PATH" ]; then
@@ -25,19 +25,12 @@ if [ ! -d "$JDK_PATH" ]; then
   mv "${PACK_PATH}/jdk-${JDK_VER}" $JDK_PATH
 fi
 
-# download javafx if can't find the javafx env
-if [ "$noGui" != "true" ] && [ ! -d "$JAVAFX_PATH" ]; then
-  wget -c http://gluonhq.com/download/javafx-11-jmods-linux -O openjfx-11_linux-x64_bin-jmods.zip
-  unzip openjfx-11_linux-x64_bin-jmods.zip -d $PACK_PATH
-  mv "${PACK_PATH}/${JAVAFX_VER}" $JAVAFX_PATH
-fi
-
 module_path=$JDK_PATH/jmods 
 add_modules="java.base,java.xml,java.logging,java.management,jdk.unsupported,jdk.sctp"
 # generate aion runtime
-if [ "$noGui" != "true" ]; then
+if [ "$useGui" = "true" ]; then
     module_path="$module_path:$JAVAFX_PATH"
-    add_modules="$add_modules,javafx.graphics,javafx.controls,javafx.base,javafx.fxml,javafx.swing"
+    add_modules="$add_modules,$JAVAFX_MODULES"
 fi
 if [ ! -d "$JDK_RT" ]; then
   $JDK_PATH/bin/jlink --module-path $module_path --add-modules $add_modules \
diff --git a/settings.gradle b/settings.gradle
index 0612932970..20effb692d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
 rootProject.name = 'aion'
 include 'modAionBase', 'modAion', 'modAionImpl',
+    'modUtil',
     'modCrypto',
     'modLogger',
     'modRlp',
@@ -15,10 +16,15 @@ include 'modAionBase', 'modAion', 'modAionImpl',
     'aion_api',
     'modBoot'
 
-if (!hasProperty('noGui')) {
-    include 'modGui'
-}
-
 project(":aion_fastvm/modFastVM").name = "aion_fastvm"
 
+// only build and distribute modGui only if explicitly specified
+if (hasProperty('modGuiPath') && !modGuiPath.empty) {
+    include modGuiPath
+    project(':' + modGuiPath).name = "modGui"
+    gradle.ext.useGui = true;
+} else { 
+    gradle.ext.useGui = false;
+}
+