diff --git a/Shared/ProviderConfigurationKeys.swift b/Shared/ProviderConfigurationKeys.swift
index 5a29349..0695e97 100644
--- a/Shared/ProviderConfigurationKeys.swift
+++ b/Shared/ProviderConfigurationKeys.swift
@@ -1,8 +1,4 @@
 //
-//  ProviderConfigurationKeys.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 12-08-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/Shared/Validators.swift b/Shared/Validators.swift
index e979aad..4eb19cb 100644
--- a/Shared/Validators.swift
+++ b/Shared/Validators.swift
@@ -1,8 +1,4 @@
 //
-//  IPValidator.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 15-08-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/AppDelegate.swift b/WireGuard/AppDelegate.swift
index 1c4f1ed..6b3eee8 100644
--- a/WireGuard/AppDelegate.swift
+++ b/WireGuard/AppDelegate.swift
@@ -1,8 +1,4 @@
 //
-//  AppDelegate.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/Coordinators/AppCoordinator.swift b/WireGuard/Coordinators/AppCoordinator.swift
index 4120bf4..0fa8d84 100644
--- a/WireGuard/Coordinators/AppCoordinator.swift
+++ b/WireGuard/Coordinators/AppCoordinator.swift
@@ -1,8 +1,4 @@
 //
-//  AppCoordinator.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/Coordinators/Coordinator.swift b/WireGuard/Coordinators/Coordinator.swift
index 0322383..d4263fc 100644
--- a/WireGuard/Coordinators/Coordinator.swift
+++ b/WireGuard/Coordinators/Coordinator.swift
@@ -1,8 +1,4 @@
 //
-//  Coordinator.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/Coordinators/RootCoordinator.swift b/WireGuard/Coordinators/RootCoordinator.swift
index f77689a..79ca0ad 100644
--- a/WireGuard/Coordinators/RootCoordinator.swift
+++ b/WireGuard/Coordinators/RootCoordinator.swift
@@ -1,8 +1,4 @@
 //
-//  RootCoordinator.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/Log.swift b/WireGuard/Log.swift
index 06823e8..7472934 100644
--- a/WireGuard/Log.swift
+++ b/WireGuard/Log.swift
@@ -1,8 +1,4 @@
 //
-//  Log.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 07-07-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/Models/Interface+CoreDataClass.swift b/WireGuard/Models/Interface+CoreDataClass.swift
index fdedba0..f57b5a9 100644
--- a/WireGuard/Models/Interface+CoreDataClass.swift
+++ b/WireGuard/Models/Interface+CoreDataClass.swift
@@ -1,9 +1,5 @@
 //
-//  Interface+CoreDataClass.swift
-//  
-//
-//  Created by Jeroen Leenarts on 23-05-18.
-//
+//  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
 import Foundation
diff --git a/WireGuard/Models/Interface+CoreDataProperties.swift b/WireGuard/Models/Interface+CoreDataProperties.swift
index 0f82c60..b512dc0 100644
--- a/WireGuard/Models/Interface+CoreDataProperties.swift
+++ b/WireGuard/Models/Interface+CoreDataProperties.swift
@@ -1,11 +1,6 @@
 //
-//  Interface+CoreDataProperties.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 24-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
-//
 
 import Foundation
 import CoreData
diff --git a/WireGuard/Models/Peer+CoreDataClass.swift b/WireGuard/Models/Peer+CoreDataClass.swift
index 1cd36a3..d8c4664 100644
--- a/WireGuard/Models/Peer+CoreDataClass.swift
+++ b/WireGuard/Models/Peer+CoreDataClass.swift
@@ -1,9 +1,5 @@
 //
-//  Peer+CoreDataClass.swift
-//  
-//
-//  Created by Jeroen Leenarts on 23-05-18.
-//
+//  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
 import Foundation
diff --git a/WireGuard/Models/Peer+CoreDataProperties.swift b/WireGuard/Models/Peer+CoreDataProperties.swift
index 32187df..50132e7 100644
--- a/WireGuard/Models/Peer+CoreDataProperties.swift
+++ b/WireGuard/Models/Peer+CoreDataProperties.swift
@@ -1,9 +1,5 @@
 //
-//  Peer+CoreDataProperties.swift
-//  
-//
-//  Created by Jeroen Leenarts on 23-05-18.
-//
+//  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
 import Foundation
diff --git a/WireGuard/Models/Tunnel+CoreDataClass.swift b/WireGuard/Models/Tunnel+CoreDataClass.swift
index 0341096..f26d33c 100644
--- a/WireGuard/Models/Tunnel+CoreDataClass.swift
+++ b/WireGuard/Models/Tunnel+CoreDataClass.swift
@@ -1,11 +1,6 @@
 //
-//  Tunnel+CoreDataClass.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
-//
 
 import Foundation
 import CoreData
diff --git a/WireGuard/Models/Tunnel+CoreDataProperties.swift b/WireGuard/Models/Tunnel+CoreDataProperties.swift
index b4e69e9..2bfad02 100644
--- a/WireGuard/Models/Tunnel+CoreDataProperties.swift
+++ b/WireGuard/Models/Tunnel+CoreDataProperties.swift
@@ -1,11 +1,6 @@
 //
-//  Tunnel+CoreDataProperties.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
-//
 
 import Foundation
 import CoreData
diff --git a/WireGuard/Models/Tunnel+Extension.swift b/WireGuard/Models/Tunnel+Extension.swift
index cd1409d..99271a1 100644
--- a/WireGuard/Models/Tunnel+Extension.swift
+++ b/WireGuard/Models/Tunnel+Extension.swift
@@ -1,8 +1,4 @@
 //
-//  Tunnel+Extension.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 04-08-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/ViewControllers/Identifyable.swift b/WireGuard/ViewControllers/Identifyable.swift
index ef862b3..c94a399 100644
--- a/WireGuard/ViewControllers/Identifyable.swift
+++ b/WireGuard/ViewControllers/Identifyable.swift
@@ -1,8 +1,4 @@
 //
-//  Identifyable.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift b/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift
index ab4eabb..7f66529 100644
--- a/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift
+++ b/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift
@@ -1,8 +1,4 @@
 //
-//  TunnelConfigurationTableViewController.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 24-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/ViewControllers/TunnelInfoTableViewController.swift b/WireGuard/ViewControllers/TunnelInfoTableViewController.swift
index 0b4b038..7e05222 100644
--- a/WireGuard/ViewControllers/TunnelInfoTableViewController.swift
+++ b/WireGuard/ViewControllers/TunnelInfoTableViewController.swift
@@ -1,8 +1,4 @@
 //
-//  TunnelInfoTableViewController.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 15-09-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/ViewControllers/TunnelsTableViewController.swift b/WireGuard/ViewControllers/TunnelsTableViewController.swift
index 385000c..a66d3e3 100644
--- a/WireGuard/ViewControllers/TunnelsTableViewController.swift
+++ b/WireGuard/ViewControllers/TunnelsTableViewController.swift
@@ -1,8 +1,4 @@
 //
-//  TunnelsTableViewController.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 23-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuard/ViewControllers/UITableView+WireGuard.swift b/WireGuard/ViewControllers/UITableView+WireGuard.swift
index 244b1e5..a8b913b 100644
--- a/WireGuard/ViewControllers/UITableView+WireGuard.swift
+++ b/WireGuard/ViewControllers/UITableView+WireGuard.swift
@@ -1,8 +1,4 @@
 //
-//  UITableView+WireGuard.swift
-//  WireGuard
-//
-//  Created by Jeroen Leenarts on 24-05-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuardNetworkExtension/Log.swift b/WireGuardNetworkExtension/Log.swift
index d415f15..40e097f 100644
--- a/WireGuardNetworkExtension/Log.swift
+++ b/WireGuardNetworkExtension/Log.swift
@@ -1,8 +1,4 @@
 //
-//  Log.swift
-//  WireGuardNetworkExtension
-//
-//  Created by Jeroen Leenarts on 07-07-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuardNetworkExtension/PacketTunnelProvider.swift
index 3cf621b..daa5112 100644
--- a/WireGuardNetworkExtension/PacketTunnelProvider.swift
+++ b/WireGuardNetworkExtension/PacketTunnelProvider.swift
@@ -1,8 +1,4 @@
 //
-//  PacketTunnelProvider.swift
-//  WireGuardNetworkExtension
-//
-//  Created by Jeroen Leenarts on 19-06-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //
 
diff --git a/WireGuardTests/ValidatorsTests.swift b/WireGuardTests/ValidatorsTests.swift
index ddd3a52..39acd06 100644
--- a/WireGuardTests/ValidatorsTests.swift
+++ b/WireGuardTests/ValidatorsTests.swift
@@ -1,8 +1,4 @@
 //
-//  ValidatorsTests.swift
-//  WireGuardTests
-//
-//  Created by Jeroen Leenarts on 15-08-18.
 //  Copyright © 2018 WireGuard LLC. All rights reserved.
 //