diff --git a/LICENSE b/LICENSE
index c6bdfd758..6448684ef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,202 +1,21 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in write by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in write, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in write, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [2015] [Zalando SE]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in write, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+The MIT License (MIT)
+
+Copyright (c) 2015-2016 Zalando SE
+
+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/logbook-api/src/main/java/org/zalando/logbook/BaseHttpMessage.java b/logbook-api/src/main/java/org/zalando/logbook/BaseHttpMessage.java
index 855bf8fca..41f2c6d43 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/BaseHttpMessage.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/BaseHttpMessage.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/logbook-api/src/main/java/org/zalando/logbook/BaseHttpRequest.java b/logbook-api/src/main/java/org/zalando/logbook/BaseHttpRequest.java
index a43e78d71..31ebb23e1 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/BaseHttpRequest.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/BaseHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.Optional;
 
 public interface BaseHttpRequest extends BaseHttpMessage {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/BaseHttpResponse.java b/logbook-api/src/main/java/org/zalando/logbook/BaseHttpResponse.java
index 7b98572bb..f33d84125 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/BaseHttpResponse.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/BaseHttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public interface BaseHttpResponse extends BaseHttpMessage {
 
     int getStatus();
diff --git a/logbook-api/src/main/java/org/zalando/logbook/BodyObfuscator.java b/logbook-api/src/main/java/org/zalando/logbook/BodyObfuscator.java
index 72b0507ef..183458fe9 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/BodyObfuscator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/BodyObfuscator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 @FunctionalInterface
 public interface BodyObfuscator {
 
diff --git a/logbook-api/src/main/java/org/zalando/logbook/Correlation.java b/logbook-api/src/main/java/org/zalando/logbook/Correlation.java
index a7d8e8f0f..96999d68f 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/Correlation.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/Correlation.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public interface Correlation<Request, Response> {
 
     String getId();
diff --git a/logbook-api/src/main/java/org/zalando/logbook/Correlator.java b/logbook-api/src/main/java/org/zalando/logbook/Correlator.java
index 62d2e42a0..f7b34e2a0 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/Correlator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/Correlator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 
 public interface Correlator {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java b/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java
index cd36600cf..f3dca6ad7 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpMessage.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
diff --git a/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpRequest.java b/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpRequest.java
index 06357e9a2..18f8e1e29 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpRequest.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.Optional;
 
 public abstract class ForwardingHttpRequest extends ForwardingHttpMessage implements HttpRequest {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpResponse.java b/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpResponse.java
index 1fe397c53..e30c9cf57 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpResponse.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/ForwardingHttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public abstract class ForwardingHttpResponse extends ForwardingHttpMessage implements HttpResponse {
 
     @Override
diff --git a/logbook-api/src/main/java/org/zalando/logbook/ForwardingRawHttpRequest.java b/logbook-api/src/main/java/org/zalando/logbook/ForwardingRawHttpRequest.java
index 6339fbfd1..da10e382b 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/ForwardingRawHttpRequest.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/ForwardingRawHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
diff --git a/logbook-api/src/main/java/org/zalando/logbook/HeaderObfuscator.java b/logbook-api/src/main/java/org/zalando/logbook/HeaderObfuscator.java
index 1de5e2772..f30fef051 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/HeaderObfuscator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/HeaderObfuscator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 @FunctionalInterface
 public interface HeaderObfuscator {
 
diff --git a/logbook-api/src/main/java/org/zalando/logbook/HttpLogFormatter.java b/logbook-api/src/main/java/org/zalando/logbook/HttpLogFormatter.java
index afab5c529..0b68ecbfc 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/HttpLogFormatter.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/HttpLogFormatter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 
 public interface HttpLogFormatter {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/HttpLogWriter.java b/logbook-api/src/main/java/org/zalando/logbook/HttpLogWriter.java
index 300770e2d..8e30d35a0 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/HttpLogWriter.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/HttpLogWriter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 
 public interface HttpLogWriter {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/HttpMessage.java b/logbook-api/src/main/java/org/zalando/logbook/HttpMessage.java
index 4ef8f58f3..b8bc09562 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/HttpMessage.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/HttpMessage.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 
 public interface HttpMessage extends BaseHttpMessage {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/HttpRequest.java b/logbook-api/src/main/java/org/zalando/logbook/HttpRequest.java
index cdd05bcae..b17bc1317 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/HttpRequest.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/HttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public interface HttpRequest extends HttpMessage, BaseHttpRequest {
 
 }
diff --git a/logbook-api/src/main/java/org/zalando/logbook/HttpResponse.java b/logbook-api/src/main/java/org/zalando/logbook/HttpResponse.java
index e88edd614..9d66b2e66 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/HttpResponse.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/HttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public interface HttpResponse extends HttpMessage, BaseHttpResponse {
 
 }
diff --git a/logbook-api/src/main/java/org/zalando/logbook/Logbook.java b/logbook-api/src/main/java/org/zalando/logbook/Logbook.java
index 4f42e2574..950d3969f 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/Logbook.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/Logbook.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/logbook-api/src/main/java/org/zalando/logbook/LogbookCreator.java b/logbook-api/src/main/java/org/zalando/logbook/LogbookCreator.java
index 7edfad6de..1b3e5ab22 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/LogbookCreator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/LogbookCreator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import lombok.Singular;
 
 import javax.annotation.Nullable;
diff --git a/logbook-api/src/main/java/org/zalando/logbook/LogbookFactory.java b/logbook-api/src/main/java/org/zalando/logbook/LogbookFactory.java
index b768ef69f..7de08f20b 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/LogbookFactory.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/LogbookFactory.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import java.util.function.Predicate;
 
diff --git a/logbook-api/src/main/java/org/zalando/logbook/Origin.java b/logbook-api/src/main/java/org/zalando/logbook/Origin.java
index bb2635549..0be770be2 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/Origin.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/Origin.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public enum Origin {
 
     LOCAL, REMOTE
diff --git a/logbook-api/src/main/java/org/zalando/logbook/Precorrelation.java b/logbook-api/src/main/java/org/zalando/logbook/Precorrelation.java
index 4d803890e..661596db1 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/Precorrelation.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/Precorrelation.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public interface Precorrelation<Request> {
 
     String getId();
diff --git a/logbook-api/src/main/java/org/zalando/logbook/QueryObfuscator.java b/logbook-api/src/main/java/org/zalando/logbook/QueryObfuscator.java
index d3f25768f..6c1b15ba8 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/QueryObfuscator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/QueryObfuscator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 @FunctionalInterface
 public interface QueryObfuscator {
 
diff --git a/logbook-api/src/main/java/org/zalando/logbook/RawHttpRequest.java b/logbook-api/src/main/java/org/zalando/logbook/RawHttpRequest.java
index 4dd79c25e..e0e3d8e0f 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/RawHttpRequest.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/RawHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 
 public interface RawHttpRequest extends BaseHttpRequest {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/RawHttpResponse.java b/logbook-api/src/main/java/org/zalando/logbook/RawHttpResponse.java
index bb89c62d1..01a383043 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/RawHttpResponse.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/RawHttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 
 public interface RawHttpResponse extends BaseHttpResponse {
diff --git a/logbook-api/src/main/java/org/zalando/logbook/RequestObfuscator.java b/logbook-api/src/main/java/org/zalando/logbook/RequestObfuscator.java
index 88b707b61..c1196ff0b 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/RequestObfuscator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/RequestObfuscator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 @FunctionalInterface
 public interface RequestObfuscator {
 
diff --git a/logbook-api/src/main/java/org/zalando/logbook/RequestURI.java b/logbook-api/src/main/java/org/zalando/logbook/RequestURI.java
index ddf37a167..878342ff0 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/RequestURI.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/RequestURI.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.Set;
diff --git a/logbook-api/src/main/java/org/zalando/logbook/ResponseObfuscator.java b/logbook-api/src/main/java/org/zalando/logbook/ResponseObfuscator.java
index f7c718e09..b54c038a7 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/ResponseObfuscator.java
+++ b/logbook-api/src/main/java/org/zalando/logbook/ResponseObfuscator.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 @FunctionalInterface
 public interface ResponseObfuscator {
 
diff --git a/logbook-api/src/test/java/org/zalando/logbook/BaseHttpMessageTest.java b/logbook-api/src/test/java/org/zalando/logbook/BaseHttpMessageTest.java
index 8b3db1ce6..06e9451b1 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/BaseHttpMessageTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/BaseHttpMessageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.util.Arrays;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/BaseHttpRequestTest.java b/logbook-api/src/test/java/org/zalando/logbook/BaseHttpRequestTest.java
index 6791a441e..0443bcafe 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/BaseHttpRequestTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/BaseHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.util.Optional;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/BodyObfuscatorTest.java b/logbook-api/src/test/java/org/zalando/logbook/BodyObfuscatorTest.java
index 827fffb04..1405664ab 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/BodyObfuscatorTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/BodyObfuscatorTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/EnforceCoverageTest.java b/logbook-api/src/test/java/org/zalando/logbook/EnforceCoverageTest.java
index 4614c60fa..173a76b02 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/EnforceCoverageTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/EnforceCoverageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.google.gag.annotation.remark.Hack;
 import com.google.gag.annotation.remark.OhNoYouDidnt;
 import org.junit.Test;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpRequestTest.java b/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpRequestTest.java
index 9d113d6ee..46b12f96a 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpRequestTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpResponseTest.java b/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpResponseTest.java
index ebc0e108c..f10f29d38 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpResponseTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/ForwardingHttpResponseTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/ForwardingRawHttpRequestTest.java b/logbook-api/src/test/java/org/zalando/logbook/ForwardingRawHttpRequestTest.java
index 6f14c5752..7ea6cd055 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/ForwardingRawHttpRequestTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/ForwardingRawHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/HeaderObfuscatorTest.java b/logbook-api/src/test/java/org/zalando/logbook/HeaderObfuscatorTest.java
index d7995f75c..db9f20284 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/HeaderObfuscatorTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/HeaderObfuscatorTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/HttpLogWriterTest.java b/logbook-api/src/test/java/org/zalando/logbook/HttpLogWriterTest.java
index 2defbcb15..0fb74d0a6 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/HttpLogWriterTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/HttpLogWriterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/HttpMessageTest.java b/logbook-api/src/test/java/org/zalando/logbook/HttpMessageTest.java
index 5636e674b..2a51308d8 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/HttpMessageTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/HttpMessageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/LogbookFactoryTest.java b/logbook-api/src/test/java/org/zalando/logbook/LogbookFactoryTest.java
index f94dafca4..66efb7d47 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/LogbookFactoryTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/LogbookFactoryTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.instanceOf;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/LogbookTest.java b/logbook-api/src/test/java/org/zalando/logbook/LogbookTest.java
index 05fe57dc6..5f6974802 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/LogbookTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/LogbookTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/Mockbook.java b/logbook-api/src/test/java/org/zalando/logbook/Mockbook.java
index bbc93de77..8dceda162 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/Mockbook.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/Mockbook.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Optional;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/MockbookFactory.java b/logbook-api/src/test/java/org/zalando/logbook/MockbookFactory.java
index ca379ceb0..ad85adb26 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/MockbookFactory.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/MockbookFactory.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import java.util.function.Predicate;
 
diff --git a/logbook-api/src/test/java/org/zalando/logbook/QueryObfuscatorTest.java b/logbook-api/src/test/java/org/zalando/logbook/QueryObfuscatorTest.java
index a33d98e38..2a17231fd 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/QueryObfuscatorTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/QueryObfuscatorTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/RequestObfuscatorTest.java b/logbook-api/src/test/java/org/zalando/logbook/RequestObfuscatorTest.java
index dc4f1513a..e48c848ec 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/RequestObfuscatorTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/RequestObfuscatorTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.is;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/RequestURITest.java b/logbook-api/src/test/java/org/zalando/logbook/RequestURITest.java
index fbb9e7562..28aa0d8c4 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/RequestURITest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/RequestURITest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/logbook-api/src/test/java/org/zalando/logbook/ResponseObfuscatorTest.java b/logbook-api/src/test/java/org/zalando/logbook/ResponseObfuscatorTest.java
index c9281c846..538cc5e7b 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/ResponseObfuscatorTest.java
+++ b/logbook-api/src/test/java/org/zalando/logbook/ResponseObfuscatorTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: API
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.is;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/Conditions.java b/logbook-core/src/main/java/org/zalando/logbook/Conditions.java
index 6e0c63840..1b9dc8bd2 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/Conditions.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/Conditions.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.function.BiPredicate;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogFormatter.java b/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogFormatter.java
index 4b0d430cf..b097d6fcb 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogFormatter.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogFormatter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogWriter.java b/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogWriter.java
index 7f8881876..e46d189df 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogWriter.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/DefaultHttpLogWriter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbook.java b/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbook.java
index 454578c48..5ff94b191 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbook.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbook.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbookFactory.java b/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbookFactory.java
index d824ea1e8..f92ccd5e2 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbookFactory.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/DefaultLogbookFactory.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Optional;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/Glob.java b/logbook-core/src/main/java/org/zalando/logbook/Glob.java
index f4aba51fc..c91d179c6 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/Glob.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/Glob.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/JsonHttpLogFormatter.java b/logbook-core/src/main/java/org/zalando/logbook/JsonHttpLogFormatter.java
index 22fd339bb..44fd2c8eb 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/JsonHttpLogFormatter.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/JsonHttpLogFormatter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.fasterxml.jackson.annotation.JsonRawValue;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.core.JsonFactory;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpRequest.java b/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpRequest.java
index 066bede43..2ab06d2c7 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpRequest.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpResponse.java b/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpResponse.java
index b68f6d08b..013693ce8 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpResponse.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/ObfuscatedHttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/Obfuscators.java b/logbook-core/src/main/java/org/zalando/logbook/Obfuscators.java
index d40233938..f7ada69f9 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/Obfuscators.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/Obfuscators.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
diff --git a/logbook-core/src/main/java/org/zalando/logbook/StreamHttpLogWriter.java b/logbook-core/src/main/java/org/zalando/logbook/StreamHttpLogWriter.java
index 35526f577..50237c928 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/StreamHttpLogWriter.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/StreamHttpLogWriter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.io.PrintStream;
 
diff --git a/logbook-core/src/main/java/org/zalando/logbook/package-info.java b/logbook-core/src/main/java/org/zalando/logbook/package-info.java
index 73708dc74..46107ffb3 100644
--- a/logbook-core/src/main/java/org/zalando/logbook/package-info.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/package-info.java
@@ -1,24 +1,4 @@
 @ParametersAreNonnullByDefault
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/logbook-core/src/test/java/org/zalando/logbook/ConditionsTest.java b/logbook-core/src/test/java/org/zalando/logbook/ConditionsTest.java
index afe8fe7ae..387f66838 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/ConditionsTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/ConditionsTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.util.function.Predicate;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogFormatterTest.java b/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogFormatterTest.java
index d315520b4..7444985e0 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogFormatterTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogFormatterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.zalando.logbook.DefaultLogbook.SimpleCorrelation;
 import org.zalando.logbook.DefaultLogbook.SimplePrecorrelation;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterLevelTest.java b/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterLevelTest.java
index 1dbc02908..331eff7a6 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterLevelTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterLevelTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterTest.java b/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterTest.java
index c0a5b5b3f..b69dd4ca7 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/DefaultHttpLogWriterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/DefaultLogbookTest.java b/logbook-core/src/test/java/org/zalando/logbook/DefaultLogbookTest.java
index 8ac1aeffe..c4f747302 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/DefaultLogbookTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/DefaultLogbookTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/EnforceCoverageTest.java b/logbook-core/src/test/java/org/zalando/logbook/EnforceCoverageTest.java
index db663c64c..7d3ede48f 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/EnforceCoverageTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/EnforceCoverageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.google.gag.annotation.remark.Hack;
 import com.google.gag.annotation.remark.OhNoYouDidnt;
 import org.junit.Test;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/GlobTest.java b/logbook-core/src/test/java/org/zalando/logbook/GlobTest.java
index c77a5a7ca..558337bdd 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/GlobTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/GlobTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.is;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/JsonHttpLogFormatterTest.java b/logbook-core/src/test/java/org/zalando/logbook/JsonHttpLogFormatterTest.java
index 4a4739ff4..bb9802357 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/JsonHttpLogFormatterTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/JsonHttpLogFormatterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.zalando.logbook.DefaultLogbook.SimpleCorrelation;
 import org.zalando.logbook.DefaultLogbook.SimplePrecorrelation;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpRequestTest.java b/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpRequestTest.java
index ed1ecad25..6ad1ca725 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpRequestTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpResponseTest.java b/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpResponseTest.java
index 5a1d74d1a..ffc948642 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpResponseTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/ObfuscatedHttpResponseTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/ObfuscatorsTest.java b/logbook-core/src/test/java/org/zalando/logbook/ObfuscatorsTest.java
index 8d3774e2f..6426cb922 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/ObfuscatorsTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/ObfuscatorsTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.util.List;
diff --git a/logbook-core/src/test/java/org/zalando/logbook/StreamHttpLogWriterTest.java b/logbook-core/src/test/java/org/zalando/logbook/StreamHttpLogWriterTest.java
index 748eb01e9..4e92bea31 100644
--- a/logbook-core/src/test/java/org/zalando/logbook/StreamHttpLogWriterTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/StreamHttpLogWriterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.SystemOutRule;
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Attributes.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Attributes.java
index bc9a5f9fb..7ab27557c 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Attributes.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Attributes.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Logbook;
 
 final class Attributes {
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumer.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumer.java
index 9e363fac6..4b9875863 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumer.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumer.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.HttpException;
 import org.apache.http.HttpResponse;
 import org.apache.http.nio.ContentDecoder;
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LocalRequest.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LocalRequest.java
index a213fe154..074bc9b61 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LocalRequest.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LocalRequest.java
@@ -1,7 +1,14 @@
 package org.zalando.logbook.httpclient;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.http.util.EntityUtils.toByteArray;
+import org.apache.http.Header;
+import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.HttpRequest;
+import org.apache.http.client.methods.HttpRequestWrapper;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.zalando.logbook.Origin;
+import org.zalando.logbook.RawHttpRequest;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -12,35 +19,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.http.util.EntityUtils.toByteArray;
 
-import org.apache.http.Header;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpRequest;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.ContentType;
-import org.zalando.logbook.Origin;
-import org.zalando.logbook.RawHttpRequest;
 
 final class LocalRequest implements RawHttpRequest, org.zalando.logbook.HttpRequest {
 
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Localhost.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Localhost.java
index 25242bd22..d2eafc12b 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Localhost.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/Localhost.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumer.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumer.java
index 6ef005e2e..81a7ff5b7 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumer.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumer.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.HttpException;
 import org.apache.http.HttpResponse;
 import org.apache.http.nio.ContentDecoder;
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpRequestInterceptor.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpRequestInterceptor.java
index 58404d411..328bb5d7a 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpRequestInterceptor.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpRequestInterceptor.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpResponseInterceptor.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpResponseInterceptor.java
index 4b9947df1..355d504db 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpResponseInterceptor.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/LogbookHttpResponseInterceptor.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.HttpException;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;
diff --git a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/RemoteResponse.java b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/RemoteResponse.java
index 924c21306..cc6dde71d 100644
--- a/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/RemoteResponse.java
+++ b/logbook-httpclient/src/main/java/org/zalando/logbook/httpclient/RemoteResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/AbstractHttpTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/AbstractHttpTest.java
index 2fddde10e..00604d47b 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/AbstractHttpTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/AbstractHttpTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.github.restdriver.clientdriver.ClientDriverRule;
 import org.junit.After;
 import org.junit.Before;
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/EnforceCoverageTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/EnforceCoverageTest.java
index b0e670727..79b140a66 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/EnforceCoverageTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/EnforceCoverageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.google.gag.annotation.remark.Hack;
 import com.google.gag.annotation.remark.OhNoYouDidnt;
 import org.junit.Test;
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumerTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumerTest.java
index ac3e91258..42b32a0ea 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumerTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/ForwardingHttpAsyncResponseConsumerTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.google.gag.annotation.remark.Facepalm;
 import com.google.gag.annotation.remark.Hack;
 import com.google.gag.annotation.remark.OhNoYouDidnt;
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LocalRequestTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LocalRequestTest.java
index 23be6ed4b..1cf3c64e0 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LocalRequestTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LocalRequestTest.java
@@ -1,44 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.http.util.EntityUtils.toByteArray;
-import static org.hamcrest.Matchers.aMapWithSize;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.hasToString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.matchesPattern;
-import static org.hobsoft.hamcrest.compose.ComposeMatchers.hasFeature;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
@@ -54,6 +15,24 @@
 import org.junit.rules.ExpectedException;
 import org.zalando.logbook.BaseHttpRequest;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.http.util.EntityUtils.toByteArray;
+import static org.hamcrest.Matchers.aMapWithSize;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.hasToString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.matchesPattern;
+import static org.hobsoft.hamcrest.compose.ComposeMatchers.hasFeature;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public final class LocalRequestTest {
 
     @Rule
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumerTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumerTest.java
index ba4798ab6..fcc01e924 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumerTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpAsyncResponseConsumerTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.concurrent.FutureCallback;
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpInterceptorsTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpInterceptorsTest.java
index 8e39dd8f8..f574506db 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpInterceptorsTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/LogbookHttpInterceptorsTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/RemoteResponseTest.java b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/RemoteResponseTest.java
index edca8576e..bb56b1ebe 100644
--- a/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/RemoteResponseTest.java
+++ b/logbook-httpclient/src/test/java/org/zalando/logbook/httpclient/RemoteResponseTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.httpclient;
 
-/*
- * #%L
- * Logbook: HTTP Client
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.apache.http.HttpResponse;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.message.BasicHttpResponse;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Attributes.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Attributes.java
index c45bf8a76..6cb30676a 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Attributes.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Attributes.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Logbook;
 
 final class Attributes {
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ByteStreams.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ByteStreams.java
index 23b3e00da..6fc1b83a4 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ByteStreams.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ByteStreams.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java
index 795ec4441..05a13eb59 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/HttpFilter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LocalResponse.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LocalResponse.java
index ace78a9aa..f2272cb12 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LocalResponse.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LocalResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.HttpResponse;
 import org.zalando.logbook.Origin;
 import org.zalando.logbook.RawHttpResponse;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LogbookFilter.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LogbookFilter.java
index 4d8e5996a..e46a92844 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LogbookFilter.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/LogbookFilter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Logbook;
 
 import javax.servlet.FilterChain;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/NormalStrategy.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/NormalStrategy.java
index a6c324df2..0a000b789 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/NormalStrategy.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/NormalStrategy.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Correlator;
 import org.zalando.logbook.Logbook;
 
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/RemoteRequest.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/RemoteRequest.java
index 8dacea88b..6cf79462c 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/RemoteRequest.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/RemoteRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.HttpRequest;
 import org.zalando.logbook.Origin;
 import org.zalando.logbook.RawHttpRequest;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/SecurityStrategy.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/SecurityStrategy.java
index 546ede432..64bc1cf07 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/SecurityStrategy.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/SecurityStrategy.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Correlator;
 import org.zalando.logbook.Logbook;
 
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ServletInputStreamAdapter.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ServletInputStreamAdapter.java
index 8f722a21f..f99b7f633 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ServletInputStreamAdapter.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/ServletInputStreamAdapter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.servlet.ServletInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Strategy.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Strategy.java
index 0c9b69990..06561e533 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Strategy.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/Strategy.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Logbook;
 
 import javax.servlet.DispatcherType;
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedHttpRequest.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedHttpRequest.java
index 4163d6271..2c0442915 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedHttpRequest.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.ForwardingHttpRequest;
 import org.zalando.logbook.HttpRequest;
 
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedRawHttpRequest.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedRawHttpRequest.java
index 09171d4b4..78a6a7eb2 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedRawHttpRequest.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/UnauthorizedRawHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.ForwardingRawHttpRequest;
 import org.zalando.logbook.HttpRequest;
 
diff --git a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/package-info.java b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/package-info.java
index 4a689ecdf..5556d4e57 100644
--- a/logbook-servlet/src/main/java/org/zalando/logbook/servlet/package-info.java
+++ b/logbook-servlet/src/main/java/org/zalando/logbook/servlet/package-info.java
@@ -1,24 +1,4 @@
 @ParametersAreNonnullByDefault
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/AsyncDispatchTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/AsyncDispatchTest.java
index 97e0bbfac..460d19c97 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/AsyncDispatchTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/AsyncDispatchTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ByteStreamsTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ByteStreamsTest.java
index 279f2b88f..71d2f0562 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ByteStreamsTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ByteStreamsTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Core
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.zalando.logbook.servlet.ByteStreams;
 
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/EnforceCoverageTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/EnforceCoverageTest.java
index 9502c1134..325eb1377 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/EnforceCoverageTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/EnforceCoverageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.google.gag.annotation.remark.Hack;
 import com.google.gag.annotation.remark.OhNoYouDidnt;
 import org.junit.Test;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ErrorDispatchTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ErrorDispatchTest.java
index 16415fc19..f3477fa5e 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ErrorDispatchTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ErrorDispatchTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ExampleController.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ExampleController.java
index 7dae3f2ea..5654a5128 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ExampleController.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ExampleController.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/FormattingTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/FormattingTest.java
index e015f567c..3d5438708 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/FormattingTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/FormattingTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ForwardingHttpLogFormatter.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ForwardingHttpLogFormatter.java
index 3babb4430..e9b3adf21 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ForwardingHttpLogFormatter.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/ForwardingHttpLogFormatter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.zalando.logbook.Correlation;
 import org.zalando.logbook.HttpLogFormatter;
 import org.zalando.logbook.HttpRequest;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/HttpSupportTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/HttpSupportTest.java
index 94d0dbf15..2c97ad48a 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/HttpSupportTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/HttpSupportTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/LocalResponseTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/LocalResponseTest.java
index 66f02b004..569abbf7a 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/LocalResponseTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/LocalResponseTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/Message.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/Message.java
index 492bda775..1dbaa9109 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/Message.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/Message.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 public class Message {
 
     private String value;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterSecurityTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterSecurityTest.java
index e14efbd19..386b20896 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterSecurityTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterSecurityTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterTest.java
index 20680f3e3..281878724 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/RequestBuilders.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/RequestBuilders.java
index a31e21a3a..963443f75 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/RequestBuilders.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/RequestBuilders.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.RequestBuilder;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SecurityFilter.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SecurityFilter.java
index 51d7c8aa3..c11e30cfd 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SecurityFilter.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SecurityFilter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SkipTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SkipTest.java
index 3fc2cd7e5..0a595811c 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SkipTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SkipTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SpyableFilter.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SpyableFilter.java
index 0a69712f0..ecac2acd0 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SpyableFilter.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/SpyableFilter.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/TeeTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/TeeTest.java
index 142a11b66..dd4485d3d 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/TeeTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/TeeTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/UnauthorizedHttpRequestTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/UnauthorizedHttpRequestTest.java
index e7498688b..919cbb8a7 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/UnauthorizedHttpRequestTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/UnauthorizedHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * Logbook: Servlet
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.zalando.logbook.HttpRequest;
 
diff --git a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/WritingTest.java b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/WritingTest.java
index be12e8626..5fc946c21 100644
--- a/logbook-servlet/src/test/java/org/zalando/logbook/servlet/WritingTest.java
+++ b/logbook-servlet/src/test/java/org/zalando/logbook/servlet/WritingTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.servlet;
 
-/*
- * #%L
- * logbook
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookAutoConfiguration.java b/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookAutoConfiguration.java
index 0e3099955..604c7560a 100644
--- a/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookAutoConfiguration.java
+++ b/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookAutoConfiguration.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookProperties.java b/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookProperties.java
index ebd813df8..7d2963c2b 100644
--- a/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookProperties.java
+++ b/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/LogbookProperties.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.zalando.logbook.DefaultHttpLogWriter.Level;
 
diff --git a/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/SecurityLogbookAutoConfiguration.java b/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/SecurityLogbookAutoConfiguration.java
index fce180edb..72a8daec9 100644
--- a/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/SecurityLogbookAutoConfiguration.java
+++ b/logbook-spring-boot-starter/src/main/java/org/zalando/logbook/spring/SecurityLogbookAutoConfiguration.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/AbstractTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/AbstractTest.java
index 7e2e6d5ec..be9799f56 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/AbstractTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/AbstractTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.annotation.Configuration;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/Application.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/Application.java
index b0d3c44db..d613877f2 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/Application.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/Application.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.autoconfigure.test.ImportAutoConfiguration;
 
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ExcludeTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ExcludeTest.java
index 00bc886f7..ee5da4384 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ExcludeTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ExcludeTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterDisabledTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterDisabledTest.java
index 583feddc4..6336d786c 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterDisabledTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterDisabledTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterTest.java
index 4395a4382..3c5c93b90 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FilterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleCustomTest.java
index 619fd2036..24d89123b 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleDefaultTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleDefaultTest.java
index f3a19a9ef..077dcdc04 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleDefaultTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleDefaultTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleHttpTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleHttpTest.java
index 4e7e32cbf..f5dc76237 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleHttpTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleHttpTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateBodyCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateBodyCustomTest.java
index e68692d6e..4980193f0 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateBodyCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateBodyCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersCustomTest.java
index c7b8f06a1..7ecf1d106 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersDefaultTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersDefaultTest.java
index b3a244010..d177123ff 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersDefaultTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateHeadersDefaultTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersCustomTest.java
index 0c873e695..ae5c882bf 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersDefaultTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersDefaultTest.java
index 7e293050a..80e0e2b0d 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersDefaultTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateParametersDefaultTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateRequestCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateRequestCustomTest.java
index 07c04f9e3..e63b0645a 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateRequestCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateRequestCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateResponseCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateResponseCustomTest.java
index 067661694..0362ac3c7 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateResponseCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/ObfuscateResponseCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/SecurityFilterTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/SecurityFilterTest.java
index f5c526df4..c0dff3e2c 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/SecurityFilterTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/SecurityFilterTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/StandardTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/StandardTest.java
index 43ad154fa..bd1761446 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/StandardTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/StandardTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.zalando.logbook.Logbook;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCategoryTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCategoryTest.java
index e3f9379de..78e936132 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCategoryTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCategoryTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCustomTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCustomTest.java
index 4f7523165..0283ba7c8 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCustomTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteCustomTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
diff --git a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteLevelTest.java b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteLevelTest.java
index 2097784c2..5e9e3be60 100644
--- a/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteLevelTest.java
+++ b/logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/WriteLevelTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook.spring;
 
-/*
- * #%L
- * Logbook: Spring
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockHeaders.java b/logbook-test/src/main/java/org/zalando/logbook/MockHeaders.java
index 4e27fc633..5d00251bc 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockHeaders.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockHeaders.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java b/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java
index b4c435dbb..884cda1f6 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockHttpMessage.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.Objects;
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockHttpRequest.java b/logbook-test/src/main/java/org/zalando/logbook/MockHttpRequest.java
index d73e75696..596add1e3 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockHttpRequest.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import java.nio.charset.Charset;
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockHttpResponse.java b/logbook-test/src/main/java/org/zalando/logbook/MockHttpResponse.java
index 3043d37df..68649e59a 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockHttpResponse.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockHttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import java.nio.charset.Charset;
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpRequest.java b/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpRequest.java
index 6ec44b7ec..9bf1af28f 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpRequest.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpRequest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import java.io.IOException;
diff --git a/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpResponse.java b/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpResponse.java
index 898f0b1e8..90a806a47 100644
--- a/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpResponse.java
+++ b/logbook-test/src/main/java/org/zalando/logbook/MockRawHttpResponse.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import java.io.IOException;
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockHeadersTest.java b/logbook-test/src/test/java/org/zalando/logbook/MockHeadersTest.java
index 1fb96982b..289bb10b6 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockHeadersTest.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockHeadersTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.util.List;
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTest.java b/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTest.java
index e2dc13475..e4c157ae3 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTest.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.util.Map;
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTester.java b/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTester.java
index a65d122c6..13f737f27 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTester.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockHttpMessageTester.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import java.io.IOException;
 import java.util.Optional;
 
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockHttpRequestTest.java b/logbook-test/src/test/java/org/zalando/logbook/MockHttpRequestTest.java
index 3baf0755b..3a2b8c4c8 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockHttpRequestTest.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockHttpResponseTest.java b/logbook-test/src/test/java/org/zalando/logbook/MockHttpResponseTest.java
index 55c5e68c9..e367b6e90 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockHttpResponseTest.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockHttpResponseTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpRequestTest.java b/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpRequestTest.java
index 28629258f..824c74c04 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpRequestTest.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpRequestTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpResponseTest.java b/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpResponseTest.java
index 84e54b5e5..0afc80fb7 100644
--- a/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpResponseTest.java
+++ b/logbook-test/src/test/java/org/zalando/logbook/MockRawHttpResponseTest.java
@@ -1,25 +1,5 @@
 package org.zalando.logbook;
 
-/*
- * #%L
- * Logbook: Test
- * %%
- * Copyright (C) 2015 - 2016 Zalando SE
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/pom.xml b/pom.xml
index 122e141fd..34ed2fb44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
 
     <licenses>
         <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <name>MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -359,10 +359,6 @@
                 <groupId>com.ning.maven.plugins</groupId>
                 <artifactId>maven-duplicate-finder-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -396,25 +392,6 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>2.7</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>1.8</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>update-file-header</goal>
-                            </goals>
-                            <phase>process-sources</phase>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <licenseName>apache_v2</licenseName>
-                        <excludes>
-                            <exclude>**/*.json</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>