diff --git a/app/loggerconfig.example.php b/app/loggerconfig.example.php
index 733856b1..df4e30d4 100644
--- a/app/loggerconfig.example.php
+++ b/app/loggerconfig.example.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 return [
     /** Loggers attached to every command */
     "_" => function() {
diff --git a/bin/console b/bin/console
index 438ad5b9..591f7fd4 100755
--- a/bin/console
+++ b/bin/console
@@ -1,14 +1,6 @@
 #!/usr/bin/env php
 <?php
 
-/**
-* PHPCI - Continuous Integration for PHP
-*
-* @copyright    Copyright 2013, Block 8 Limited.
-* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
-* @link         http://www.phptesting.org/
-*/
-
 use PHPCensor\Console\Application;
 
 error_reporting(-1);
diff --git a/bootstrap.php b/bootstrap.php
index 13222634..a74f2dfd 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,11 +1,4 @@
 <?php
-/**
-* PHPCI - Continuous Integration for PHP
-*
-* @copyright    Copyright 2013, Block 8 Limited.
-* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
-* @link         http://www.phptesting.org/
-*/
 
 if (!defined('ROOT_DIR')) {
     define('ROOT_DIR', __DIR__ . DIRECTORY_SEPARATOR);
diff --git a/public/index.php b/public/index.php
index 7847f5cf..8a846977 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
-* PHPCI - Continuous Integration for PHP
-*
-* @copyright    Copyright 2014, Block 8 Limited.
-* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
-* @link         https://www.phptesting.org/
-*/
-
 session_set_cookie_params(43200); // Set session cookie to last 12 hours.
 session_start();
 
diff --git a/src/PHPCensor/Application.php b/src/PHPCensor/Application.php
index a469be95..9e7157f7 100644
--- a/src/PHPCensor/Application.php
+++ b/src/PHPCensor/Application.php
@@ -1,11 +1,4 @@
 <?php
-/**
-* PHPCI - Continuous Integration for PHP
-*
-* @copyright    Copyright 2014, Block 8 Limited.
-* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
-* @link         https://www.phptesting.org/
-*/
 
 namespace PHPCensor;
 
@@ -16,9 +9,10 @@ use b8\Http\Response\RedirectResponse;
 use b8\View;
 
 /**
-* PHPCI Front Controller
-* @author   Dan Cryer <dan@block8.co.uk>
-*/
+ * PHPCI Front Controller
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class Application extends b8\Application
 {
     /**
diff --git a/src/PHPCensor/BuildFactory.php b/src/PHPCensor/BuildFactory.php
index 8d427c8c..e6d54c56 100644
--- a/src/PHPCensor/BuildFactory.php
+++ b/src/PHPCensor/BuildFactory.php
@@ -1,11 +1,4 @@
 <?php
-/**
-* PHPCI - Continuous Integration for PHP
-*
-* @copyright    Copyright 2014, Block 8 Limited.
-* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
-* @link         https://www.phptesting.org/
-*/
 
 namespace PHPCensor;
 
@@ -13,9 +6,10 @@ use b8\Store\Factory;
 use PHPCensor\Model\Build;
 
 /**
-* PHPCI Build Factory - Takes in a generic "Build" and returns a type-specific build model.
-* @author   Dan Cryer <dan@block8.co.uk>
-*/
+ * PHPCI Build Factory - Takes in a generic "Build" and returns a type-specific build model.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class BuildFactory
 {
     /**
diff --git a/src/PHPCensor/Builder.php b/src/PHPCensor/Builder.php
index 001d0126..dd8e6593 100644
--- a/src/PHPCensor/Builder.php
+++ b/src/PHPCensor/Builder.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor;
 
 use PHPCensor\Helper\BuildInterpolator;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Helper\MailerFactory;
 use PHPCensor\Logging\BuildLogger;
 use PHPCensor\Model\Build;
@@ -24,7 +15,8 @@ use PHPCensor\Plugin\Util\Factory as PluginFactory;
 
 /**
  * PHPCI Build Runner
- * @author   Dan Cryer <dan@block8.co.uk>
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Builder implements LoggerAwareInterface
 {
diff --git a/src/PHPCensor/Controller.php b/src/PHPCensor/Controller.php
index 2b6f508b..c0335893 100644
--- a/src/PHPCensor/Controller.php
+++ b/src/PHPCensor/Controller.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor;
 
@@ -17,7 +10,6 @@ use b8\View;
 
 /**
  * PHPCI Base Controller
- * @package PHPCI
  */
 class Controller extends \b8\Controller
 {
diff --git a/src/PHPCensor/Controller/BuildController.php b/src/PHPCensor/Controller/BuildController.php
index 7a0ed2f0..297aa138 100644
--- a/src/PHPCensor/Controller/BuildController.php
+++ b/src/PHPCensor/Controller/BuildController.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Controller;
 
 use b8;
@@ -22,11 +14,10 @@ use PHPCensor\Service\BuildService;
 use PHPCensor\Controller;
 
 /**
-* Build Controller - Allows users to run and view builds.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * Build Controller - Allows users to run and view builds.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class BuildController extends Controller
 {
     /**
diff --git a/src/PHPCensor/Controller/BuildStatusController.php b/src/PHPCensor/Controller/BuildStatusController.php
index 8b4e4a6e..63e1d6c7 100644
--- a/src/PHPCensor/Controller/BuildStatusController.php
+++ b/src/PHPCensor/Controller/BuildStatusController.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Controller;
 
 use b8;
@@ -20,15 +12,15 @@ use PHPCensor\Service\BuildStatusService;
 use PHPCensor\Controller;
 
 /**
-* Build Status Controller - Allows external access to build status information / images.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * Build Status Controller - Allows external access to build status information / images.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class BuildStatusController extends Controller
 {
     /* @var \PHPCensor\Store\ProjectStore */
     protected $projectStore;
+
     /* @var \PHPCensor\Store\BuildStore */
     protected $buildStore;
 
diff --git a/src/PHPCensor/Controller/GroupController.php b/src/PHPCensor/Controller/GroupController.php
index a687f112..cce9361f 100644
--- a/src/PHPCensor/Controller/GroupController.php
+++ b/src/PHPCensor/Controller/GroupController.php
@@ -1,27 +1,17 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Controller;
 
 use b8;
 use b8\Form;
-use b8\Store;
 use PHPCensor\Controller;
 use PHPCensor\Model\ProjectGroup;
 use PHPCensor\Helper\Lang;
 
 /**
  * Project Controller - Allows users to create, edit and view projects.
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Web
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class GroupController extends Controller
 {
diff --git a/src/PHPCensor/Controller/HomeController.php b/src/PHPCensor/Controller/HomeController.php
index 389294b0..1187eb1b 100644
--- a/src/PHPCensor/Controller/HomeController.php
+++ b/src/PHPCensor/Controller/HomeController.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Controller;
 
 use b8;
@@ -17,11 +9,10 @@ use PHPCensor\Model\Build;
 use PHPCensor\Controller;
 
 /**
-* Home Controller - Displays the PHPCI Dashboard.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * Home Controller - Displays the PHPCI Dashboard.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class HomeController extends Controller
 {
     /**
diff --git a/src/PHPCensor/Controller/ProjectController.php b/src/PHPCensor/Controller/ProjectController.php
index bb17db0c..c8de3b71 100644
--- a/src/PHPCensor/Controller/ProjectController.php
+++ b/src/PHPCensor/Controller/ProjectController.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Controller;
 
 use b8;
@@ -23,11 +15,10 @@ use PHPCensor\Service\BuildService;
 use PHPCensor\Service\ProjectService;
 
 /**
-* Project Controller - Allows users to create, edit and view projects.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * Project Controller - Allows users to create, edit and view projects.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class ProjectController extends PHPCensor\Controller
 {
     /**
diff --git a/src/PHPCensor/Controller/SessionController.php b/src/PHPCensor/Controller/SessionController.php
index 6449ada6..354e04f0 100644
--- a/src/PHPCensor/Controller/SessionController.php
+++ b/src/PHPCensor/Controller/SessionController.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Controller;
 
 use b8;
@@ -18,12 +10,10 @@ use PHPCensor\Security\Authentication\Service;
 use PHPCensor\Store\UserStore;
 
 /**
-* Session Controller - Handles user login / logout.
+ * Session Controller - Handles user login / logout.
  * 
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class SessionController extends Controller
 {
     /**
diff --git a/src/PHPCensor/Controller/UserController.php b/src/PHPCensor/Controller/UserController.php
index e9a95948..551a65d9 100644
--- a/src/PHPCensor/Controller/UserController.php
+++ b/src/PHPCensor/Controller/UserController.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Controller;
 
@@ -18,11 +11,10 @@ use PHPCensor\Model\User;
 use PHPCensor\Service\UserService;
 
 /**
-* User Controller - Allows an administrator to view, add, edit and delete users.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * User Controller - Allows an administrator to view, add, edit and delete users.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class UserController extends Controller
 {
     /**
diff --git a/src/PHPCensor/Helper/AnsiConverter.php b/src/PHPCensor/Helper/AnsiConverter.php
index 642984b5..709801e2 100644
--- a/src/PHPCensor/Helper/AnsiConverter.php
+++ b/src/PHPCensor/Helper/AnsiConverter.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
@@ -13,8 +6,6 @@ use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
 
 /**
  * Converts ANSI output to HTML.
- *
- * @package PHPCensor\Helper
  */
 final class AnsiConverter
 {
diff --git a/src/PHPCensor/Helper/BaseCommandExecutor.php b/src/PHPCensor/Helper/BaseCommandExecutor.php
index dda4ab6d..7e76c923 100644
--- a/src/PHPCensor/Helper/BaseCommandExecutor.php
+++ b/src/PHPCensor/Helper/BaseCommandExecutor.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
@@ -15,7 +8,6 @@ use Psr\Log\LogLevel;
 
 /**
  * Handles running system commands with variables.
- * @package PHPCensor\Helper
  */
 abstract class BaseCommandExecutor implements CommandExecutorInterface
 {
diff --git a/src/PHPCensor/Helper/Build.php b/src/PHPCensor/Helper/Build.php
index 7aae24a7..64844370 100644
--- a/src/PHPCensor/Helper/Build.php
+++ b/src/PHPCensor/Helper/Build.php
@@ -1,19 +1,11 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 /**
  * User Helper - Provides access to logged in user information in views.
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Web
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Build
 {
diff --git a/src/PHPCensor/Helper/BuildInterpolator.php b/src/PHPCensor/Helper/BuildInterpolator.php
index e8102447..038715c4 100644
--- a/src/PHPCensor/Helper/BuildInterpolator.php
+++ b/src/PHPCensor/Helper/BuildInterpolator.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
@@ -13,6 +6,7 @@ use PHPCensor\Model\Build as BaseBuild;
 
 /**
  * The BuildInterpolator class replaces variables in a string with build-specific information.
+ * 
  * @package PHPCensor\Helper
  */
 class BuildInterpolator
diff --git a/src/PHPCensor/Helper/CommandExecutorInterface.php b/src/PHPCensor/Helper/CommandExecutorInterface.php
index 77afdb25..abb1b37a 100644
--- a/src/PHPCensor/Helper/CommandExecutorInterface.php
+++ b/src/PHPCensor/Helper/CommandExecutorInterface.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
diff --git a/src/PHPCensor/Helper/Diff.php b/src/PHPCensor/Helper/Diff.php
index f9798ef0..97e393ae 100644
--- a/src/PHPCensor/Helper/Diff.php
+++ b/src/PHPCensor/Helper/Diff.php
@@ -1,17 +1,9 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 /**
  * Provides some basic diff processing functionality.
- * @package PHPCensor\Helper
  */
 class Diff
 {
diff --git a/src/PHPCensor/Helper/Email.php b/src/PHPCensor/Helper/Email.php
index eafecfff..63afafcd 100644
--- a/src/PHPCensor/Helper/Email.php
+++ b/src/PHPCensor/Helper/Email.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
@@ -14,7 +7,6 @@ use PHPCensor\Builder;
 
 /**
  * Helper class for sending emails using PHPCI's email configuration.
- * @package PHPCensor\Helper
  */
 class Email
 {
diff --git a/src/PHPCensor/Helper/Github.php b/src/PHPCensor/Helper/Github.php
index c8150d8a..6ed33398 100644
--- a/src/PHPCensor/Helper/Github.php
+++ b/src/PHPCensor/Helper/Github.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
@@ -15,7 +8,6 @@ use b8\HttpClient;
 
 /**
  * The Github Helper class provides some Github API call functionality.
- * @package PHPCensor\Helper
  */
 class Github
 {
diff --git a/src/PHPCensor/Helper/Lang.php b/src/PHPCensor/Helper/Lang.php
index c0f4b09c..893a89fa 100644
--- a/src/PHPCensor/Helper/Lang.php
+++ b/src/PHPCensor/Helper/Lang.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
@@ -14,8 +7,6 @@ use PHPCensor\Model\User;
 
 /**
  * Languages Helper Class - Handles loading strings files and the strings within them.
- *
- * @package PHPCensor\Helper
  */
 class Lang
 {
diff --git a/src/PHPCensor/Helper/LoginIsDisabled.php b/src/PHPCensor/Helper/LoginIsDisabled.php
index fca0c8fe..1420a3eb 100644
--- a/src/PHPCensor/Helper/LoginIsDisabled.php
+++ b/src/PHPCensor/Helper/LoginIsDisabled.php
@@ -1,22 +1,14 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 use b8\Config;
 
 /**
-* Login Is Disabled Helper - Checks if login is disabled in the view
-* @author       Stephen Ball <phpci@stephen.rebelinblue.com>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * Login Is Disabled Helper - Checks if login is disabled in the view
+ * 
+ * @author Stephen Ball <phpci@stephen.rebelinblue.com>
+ */
 class LoginIsDisabled
 {
     /**
diff --git a/src/PHPCensor/Helper/MailerFactory.php b/src/PHPCensor/Helper/MailerFactory.php
index efdca123..c6910b07 100644
--- a/src/PHPCensor/Helper/MailerFactory.php
+++ b/src/PHPCensor/Helper/MailerFactory.php
@@ -1,17 +1,9 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 /**
  * Class MailerFactory helps to set up and configure a SwiftMailer object.
- * @package PHPCensor\Helper
  */
 class MailerFactory
 {
diff --git a/src/PHPCensor/Helper/SshKey.php b/src/PHPCensor/Helper/SshKey.php
index a8c946e7..86e30cce 100644
--- a/src/PHPCensor/Helper/SshKey.php
+++ b/src/PHPCensor/Helper/SshKey.php
@@ -1,17 +1,9 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 /**
  * Helper class for dealing with SSH keys.
- * @package PHPCensor\Helper
  */
 class SshKey
 {
diff --git a/src/PHPCensor/Helper/UnixCommandExecutor.php b/src/PHPCensor/Helper/UnixCommandExecutor.php
index d8da7662..0e256b46 100644
--- a/src/PHPCensor/Helper/UnixCommandExecutor.php
+++ b/src/PHPCensor/Helper/UnixCommandExecutor.php
@@ -1,17 +1,9 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 /**
  * Unix/Linux specific extension of the CommandExecutor class.
- * @package PHPCensor\Helper
  */
 class UnixCommandExecutor extends BaseCommandExecutor
 {
diff --git a/src/PHPCensor/Helper/User.php b/src/PHPCensor/Helper/User.php
index 6f00e230..6ca3d25f 100644
--- a/src/PHPCensor/Helper/User.php
+++ b/src/PHPCensor/Helper/User.php
@@ -1,20 +1,12 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Helper;
 
 /**
-* User Helper - Provides access to logged in user information in views.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Web
-*/
+ * User Helper - Provides access to logged in user information in views.
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 class User
 {
     /**
diff --git a/src/PHPCensor/Languages/lang.da.php b/src/PHPCensor/Languages/lang.da.php
index 16c9d79e..dfea758a 100644
--- a/src/PHPCensor/Languages/lang.da.php
+++ b/src/PHPCensor/Languages/lang.da.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Dansk',
diff --git a/src/PHPCensor/Languages/lang.de.php b/src/PHPCensor/Languages/lang.de.php
index 0d0d58e6..270bfbe1 100644
--- a/src/PHPCensor/Languages/lang.de.php
+++ b/src/PHPCensor/Languages/lang.de.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Deutsch',
diff --git a/src/PHPCensor/Languages/lang.el.php b/src/PHPCensor/Languages/lang.el.php
index a325e311..c798cd78 100644
--- a/src/PHPCensor/Languages/lang.el.php
+++ b/src/PHPCensor/Languages/lang.el.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Ελληνικά',
diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index e54c11a4..efdbbb51 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'English',
diff --git a/src/PHPCensor/Languages/lang.es.php b/src/PHPCensor/Languages/lang.es.php
index fc90e175..20a22b54 100644
--- a/src/PHPCensor/Languages/lang.es.php
+++ b/src/PHPCensor/Languages/lang.es.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Español',
diff --git a/src/PHPCensor/Languages/lang.fr.php b/src/PHPCensor/Languages/lang.fr.php
index bbd20421..ff52e0a3 100644
--- a/src/PHPCensor/Languages/lang.fr.php
+++ b/src/PHPCensor/Languages/lang.fr.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Français',
diff --git a/src/PHPCensor/Languages/lang.it.php b/src/PHPCensor/Languages/lang.it.php
index 67568c43..e11ab293 100644
--- a/src/PHPCensor/Languages/lang.it.php
+++ b/src/PHPCensor/Languages/lang.it.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Italiano',
diff --git a/src/PHPCensor/Languages/lang.nl.php b/src/PHPCensor/Languages/lang.nl.php
index c18be985..d602a9d5 100644
--- a/src/PHPCensor/Languages/lang.nl.php
+++ b/src/PHPCensor/Languages/lang.nl.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Nederlands',
diff --git a/src/PHPCensor/Languages/lang.pl.php b/src/PHPCensor/Languages/lang.pl.php
index 0dc21564..f492cc41 100644
--- a/src/PHPCensor/Languages/lang.pl.php
+++ b/src/PHPCensor/Languages/lang.pl.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Polski',
diff --git a/src/PHPCensor/Languages/lang.pt-br.php b/src/PHPCensor/Languages/lang.pt-br.php
index a5b98013..c28eb228 100644
--- a/src/PHPCensor/Languages/lang.pt-br.php
+++ b/src/PHPCensor/Languages/lang.pt-br.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Português Brasil',
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index 9a1cad9a..b52529cc 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Pусский',
diff --git a/src/PHPCensor/Languages/lang.uk.php b/src/PHPCensor/Languages/lang.uk.php
index 7767470d..def1391a 100644
--- a/src/PHPCensor/Languages/lang.uk.php
+++ b/src/PHPCensor/Languages/lang.uk.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => 'Українська',
diff --git a/src/PHPCensor/Languages/lang.zh.php b/src/PHPCensor/Languages/lang.zh.php
index de37f9db..fc96b005 100644
--- a/src/PHPCensor/Languages/lang.zh.php
+++ b/src/PHPCensor/Languages/lang.zh.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 return [
     'language_name' => '简体中文',
diff --git a/src/PHPCensor/Logging/BuildDBLogHandler.php b/src/PHPCensor/Logging/BuildDBLogHandler.php
index 387aa486..50789c4d 100644
--- a/src/PHPCensor/Logging/BuildDBLogHandler.php
+++ b/src/PHPCensor/Logging/BuildDBLogHandler.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Logging;
 
@@ -16,7 +9,6 @@ use Psr\Log\LogLevel;
 
 /**
  * Class BuildDBLogHandler writes the build log to the database.
- * @package PHPCensor\Logging
  */
 class BuildDBLogHandler extends AbstractProcessingHandler
 {
diff --git a/src/PHPCensor/Logging/BuildLogger.php b/src/PHPCensor/Logging/BuildLogger.php
index b1e58c83..20c6361f 100644
--- a/src/PHPCensor/Logging/BuildLogger.php
+++ b/src/PHPCensor/Logging/BuildLogger.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Logging;
 
@@ -16,7 +9,6 @@ use Psr\Log\LogLevel;
 
 /**
  * Class BuildLogger
- * @package PHPCensor\Logging
  */
 class BuildLogger implements LoggerAwareInterface
 {
diff --git a/src/PHPCensor/Logging/Handler.php b/src/PHPCensor/Logging/Handler.php
index 870b4fcf..532b1aa3 100644
--- a/src/PHPCensor/Logging/Handler.php
+++ b/src/PHPCensor/Logging/Handler.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Logging;
 
@@ -13,7 +6,6 @@ use Psr\Log\LoggerInterface;
 
 /**
  * Base Log Handler
- * @package PHPCensor\Logging
  */
 class Handler
 {
diff --git a/src/PHPCensor/Logging/LoggedBuildContextTidier.php b/src/PHPCensor/Logging/LoggedBuildContextTidier.php
index bb44053f..4afa4776 100644
--- a/src/PHPCensor/Logging/LoggedBuildContextTidier.php
+++ b/src/PHPCensor/Logging/LoggedBuildContextTidier.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Logging;
 
@@ -13,7 +6,6 @@ use PHPCensor\Model\Build;
 
 /**
  * Class LoggedBuildContextTidier cleans up build log entries.
- * @package PHPCensor\Logging
  */
 class LoggedBuildContextTidier
 {
diff --git a/src/PHPCensor/Logging/LoggerConfig.php b/src/PHPCensor/Logging/LoggerConfig.php
index ece13b9e..79f6af30 100644
--- a/src/PHPCensor/Logging/LoggerConfig.php
+++ b/src/PHPCensor/Logging/LoggerConfig.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Logging;
 
@@ -13,7 +6,6 @@ use Monolog\Logger;
 
 /**
  * Class LoggerConfig
- * @package PHPCensor\Logging
  */
 class LoggerConfig
 {
diff --git a/src/PHPCensor/Logging/OutputLogHandler.php b/src/PHPCensor/Logging/OutputLogHandler.php
index 3d146886..dcbab04b 100644
--- a/src/PHPCensor/Logging/OutputLogHandler.php
+++ b/src/PHPCensor/Logging/OutputLogHandler.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Logging;
 
@@ -15,7 +8,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class OutputLogHandler outputs the build log to the terminal.
- * @package PHPCensor\Logging
  */
 class OutputLogHandler extends AbstractProcessingHandler
 {
diff --git a/src/PHPCensor/Model.php b/src/PHPCensor/Model.php
index ddf1f091..dab1dc7a 100644
--- a/src/PHPCensor/Model.php
+++ b/src/PHPCensor/Model.php
@@ -1,18 +1,7 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor;
 
-/**
- * PHPCI Base Model.
- * @package PHPCI
- */
 abstract class Model extends \b8\Model
 {
 
diff --git a/src/PHPCensor/Model/Build.php b/src/PHPCensor/Model/Build.php
index d4f25945..0d3539db 100644
--- a/src/PHPCensor/Model/Build.php
+++ b/src/PHPCensor/Model/Build.php
@@ -625,7 +625,7 @@ class Build extends Model
 
     /**
      * Return a template to use to generate a link to a specific file.
-     * 
+     *
      * @return null
      */
     public function getFileLinkTemplate()
@@ -830,7 +830,12 @@ class Build extends Model
 
         if (empty($this->currentBuildPath)) {
             $buildDirectory         = $this->getId() . '_' . substr(md5(microtime(true)), 0, 5);
-            $this->currentBuildPath = RUNTIME_DIR . 'builds' . DIRECTORY_SEPARATOR . $buildDirectory . DIRECTORY_SEPARATOR;
+            $this->currentBuildPath = 
+                RUNTIME_DIR .
+                'builds' .
+                DIRECTORY_SEPARATOR .
+                $buildDirectory .
+                DIRECTORY_SEPARATOR;
         }
 
         return $this->currentBuildPath;
@@ -880,10 +885,10 @@ class Build extends Model
 
     /**
      * Create a working copy by cloning, copying, or similar.
-     * 
+     *
      * @param Builder $builder
      * @param string  $buildPath
-     * 
+     *
      * @return boolean
      */
     public function createWorkingCopy(Builder $builder, $buildPath)
diff --git a/src/PHPCensor/Plugin.php b/src/PHPCensor/Plugin.php
index 0c5c9d0a..4b3088d3 100644
--- a/src/PHPCensor/Plugin.php
+++ b/src/PHPCensor/Plugin.php
@@ -1,21 +1,14 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor;
 
 use PHPCensor\Model\Build;
 
 /**
-* PHPCI Plugin class - Used by all build plugins.
+ * PHPCI Plugin class - Used by all build plugins.
  * 
-* @author Dan Cryer <dan@block8.co.uk>
-*/
+ * @author Dan Cryer <dan@block8.co.uk>
+ */
 abstract class Plugin
 {
     /**
diff --git a/src/PHPCensor/Plugin/Atoum.php b/src/PHPCensor/Plugin/Atoum.php
index 92056591..07029a15 100644
--- a/src/PHPCensor/Plugin/Atoum.php
+++ b/src/PHPCensor/Plugin/Atoum.php
@@ -1,29 +1,34 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin;
 
 /**
  * Atoum plugin, runs Atoum tests within a project.
- * 
- * @package PHPCI\Plugin
  */
 class Atoum extends Plugin
 {
+    /**
+     * @var string
+     */
     protected $executable;
+
+    /**
+     * @var array
+     */
     protected $args;
+
+    /**
+     * @var array
+     */
     protected $config;
+
+    /**
+     * @var string
+     */
     protected $directory;
 
     /**
@@ -62,6 +67,7 @@ class Atoum extends Plugin
 
     /**
      * Run the Atoum plugin.
+     * 
      * @return bool
      */
     public function execute()
@@ -71,27 +77,33 @@ class Atoum extends Plugin
         if ($this->args !== null) {
             $cmd .= " {$this->args}";
         }
+
         if ($this->config !== null) {
             $cmd .= " -c '{$this->config}'";
         }
+
         if ($this->directory !== null) {
             $dirPath = $this->builder->buildPath . DIRECTORY_SEPARATOR . $this->directory;
             $cmd .= " -d '{$dirPath}'";
         }
+
         chdir($this->builder->buildPath);
+
         $output = '';
         $status = true;
+
         exec($cmd, $output);
 
         if (count(preg_grep("/Success \(/", $output)) == 0) {
             $status = false;
             $this->builder->log($output);
         }
+
         if (count($output) == 0) {
             $status = false;
             $this->builder->log('No tests have been performed.');
         }
-        
+
         return $status;
     }
 }
diff --git a/src/PHPCensor/Plugin/Behat.php b/src/PHPCensor/Plugin/Behat.php
index dc0563b5..ed5c15db 100644
--- a/src/PHPCensor/Plugin/Behat.php
+++ b/src/PHPCensor/Plugin/Behat.php
@@ -1,16 +1,8 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Model\BuildError;
 use PHPCensor\Plugin;
@@ -18,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * Behat BDD Plugin
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Behat extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Campfire.php b/src/PHPCensor/Plugin/Campfire.php
index d59441d7..d17d110e 100644
--- a/src/PHPCensor/Plugin/Campfire.php
+++ b/src/PHPCensor/Plugin/Campfire.php
@@ -1,26 +1,15 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin;
 
 /**
- * Campfire Plugin - Allows Campfire API actions.
- * strongly based on icecube (http://labs.mimmin.com/icecube)
+ * Campfire Plugin - Allows Campfire API actions. Strongly based on icecube (http://labs.mimmin.com/icecube)
  * 
- * @author       André Cianfarani <acianfa@gmail.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author André Cianfarani <acianfa@gmail.com>
  */
 class Campfire extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/CleanBuild.php b/src/PHPCensor/Plugin/CleanBuild.php
index 30c33616..375b96dd 100644
--- a/src/PHPCensor/Plugin/CleanBuild.php
+++ b/src/PHPCensor/Plugin/CleanBuild.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\Plugin;
  * Clean build removes Composer related files and allows PHPCI users to clean up their build directory.
  * Useful as a precursor to copy_build.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class CleanBuild extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Codeception.php b/src/PHPCensor/Plugin/Codeception.php
index 35121b1d..402fc887 100644
--- a/src/PHPCensor/Plugin/Codeception.php
+++ b/src/PHPCensor/Plugin/Codeception.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -19,11 +12,9 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * Codeception Plugin - Enables full acceptance, unit, and functional testing.
  * 
- * @author       Don Gilbert <don@dongilbert.net>
- * @author       Igor Timoshenko <contact@igortimoshenko.com>
- * @author       Adam Cooper <adam@networkpie.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Don Gilbert <don@dongilbert.net>
+ * @author Igor Timoshenko <contact@igortimoshenko.com>
+ * @author Adam Cooper <adam@networkpie.co.uk>
  */
 class Codeception extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/Composer.php b/src/PHPCensor/Plugin/Composer.php
index 1d34fdc6..25b95958 100644
--- a/src/PHPCensor/Plugin/Composer.php
+++ b/src/PHPCensor/Plugin/Composer.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +11,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * Composer Plugin - Provides access to Composer functionality.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Composer extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/CopyBuild.php b/src/PHPCensor/Plugin/CopyBuild.php
index 1766b006..1c2a28c2 100644
--- a/src/PHPCensor/Plugin/CopyBuild.php
+++ b/src/PHPCensor/Plugin/CopyBuild.php
@@ -1,25 +1,15 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
 use PHPCensor\Model\Build;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Plugin;
 
 /**
  * Copy Build Plugin - Copies the entire build to another directory.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class CopyBuild extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Deployer.php b/src/PHPCensor/Plugin/Deployer.php
index 93d47699..e03c4ae4 100644
--- a/src/PHPCensor/Plugin/Deployer.php
+++ b/src/PHPCensor/Plugin/Deployer.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * Integrates PHPCI with Deployer: https://github.com/rebelinblue/deployer
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Deployer extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Email.php b/src/PHPCensor/Plugin/Email.php
index 39e804ae..0c0580dd 100644
--- a/src/PHPCensor/Plugin/Email.php
+++ b/src/PHPCensor/Plugin/Email.php
@@ -1,16 +1,8 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use b8\View;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Helper\Email as EmailHelper;
 use Psr\Log\LogLevel;
 use PHPCensor\Plugin;
@@ -18,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * Email Plugin - Provides simple email capability to PHPCI.
  * 
- * @author       Steve Brazier <meadsteve@gmail.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Steve Brazier <meadsteve@gmail.com>
  */
 class Email extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Env.php b/src/PHPCensor/Plugin/Env.php
index b666b311..cec07038 100644
--- a/src/PHPCensor/Plugin/Env.php
+++ b/src/PHPCensor/Plugin/Env.php
@@ -1,23 +1,13 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
-use PHPCensor\Helper\Lang;
 use PHPCensor\Plugin;
 
 /**
  * Environment variable plugin
  * 
- * @author       Steve Kamerman <stevekamerman@gmail.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Steve Kamerman <stevekamerman@gmail.com>
  */
 class Env extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/FlowdockNotify.php b/src/PHPCensor/Plugin/FlowdockNotify.php
index d00fd52b..a8d267e1 100644
--- a/src/PHPCensor/Plugin/FlowdockNotify.php
+++ b/src/PHPCensor/Plugin/FlowdockNotify.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
diff --git a/src/PHPCensor/Plugin/Git.php b/src/PHPCensor/Plugin/Git.php
index 72a1c858..ab01b0ac 100644
--- a/src/PHPCensor/Plugin/Git.php
+++ b/src/PHPCensor/Plugin/Git.php
@@ -1,23 +1,13 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
-use PHPCensor\Helper\Lang;
 use PHPCensor\Plugin;
 
 /**
  * Git plugin.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Git extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Grunt.php b/src/PHPCensor/Plugin/Grunt.php
index 6810a614..95173f50 100644
--- a/src/PHPCensor/Plugin/Grunt.php
+++ b/src/PHPCensor/Plugin/Grunt.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * Grunt Plugin - Provides access to grunt functionality.
  * 
- * @author       Tobias Tom <t.tom@succont.de>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Tobias Tom <t.tom@succont.de>
  */
 class Grunt extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Gulp.php b/src/PHPCensor/Plugin/Gulp.php
index adb88c2f..bc0c37cf 100644
--- a/src/PHPCensor/Plugin/Gulp.php
+++ b/src/PHPCensor/Plugin/Gulp.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * Gulp Plugin - Provides access to gulp functionality.
  * 
- * @author       Dirk Heilig <dirk@heilig-online.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dirk Heilig <dirk@heilig-online.com>
  */
 class Gulp extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/HipchatNotify.php b/src/PHPCensor/Plugin/HipchatNotify.php
index db3fb791..9b2cb710 100644
--- a/src/PHPCensor/Plugin/HipchatNotify.php
+++ b/src/PHPCensor/Plugin/HipchatNotify.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +11,7 @@ use HipChat\HipChat;
 /**
  * Hipchat Plugin
  * 
- * @author       James Inman <james@jamesinman.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author James Inman <james@jamesinman.co.uk>
  */
 class HipchatNotify extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Irc.php b/src/PHPCensor/Plugin/Irc.php
index a618bb06..528b815b 100644
--- a/src/PHPCensor/Plugin/Irc.php
+++ b/src/PHPCensor/Plugin/Irc.php
@@ -1,25 +1,15 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin;
 
 /**
  * IRC Plugin - Sends a notification to an IRC channel
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Irc extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Lint.php b/src/PHPCensor/Plugin/Lint.php
index 2e68b5f1..4c462d7b 100644
--- a/src/PHPCensor/Plugin/Lint.php
+++ b/src/PHPCensor/Plugin/Lint.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * PHP Lint Plugin - Provides access to PHP lint functionality.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Lint extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Mysql.php b/src/PHPCensor/Plugin/Mysql.php
index ff8b3681..0005b27a 100644
--- a/src/PHPCensor/Plugin/Mysql.php
+++ b/src/PHPCensor/Plugin/Mysql.php
@@ -1,17 +1,9 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PDO;
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin;
 use b8\Database;
@@ -19,10 +11,8 @@ use b8\Database;
 /**
  * MySQL Plugin - Provides access to a MySQL database.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @author       Steve Kamerman <stevekamerman@gmail.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
+ * @author Steve Kamerman <stevekamerman@gmail.com>
  */
 class Mysql extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Option/PhpUnitOptions.php b/src/PHPCensor/Plugin/Option/PhpUnitOptions.php
index ea91d3ea..bb7cf6dc 100644
--- a/src/PHPCensor/Plugin/Option/PhpUnitOptions.php
+++ b/src/PHPCensor/Plugin/Option/PhpUnitOptions.php
@@ -1,21 +1,11 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Plugin\Option;
 
 /**
  * Class PhpUnitOptions validates and parse the option for the PhpUnitV2 plugin
  *
- * @author       Pablo Tejada <pablo@ptejada.com>
- * @package      PHPCI
- * @subpackage   Plugin
+ * @author Pablo Tejada <pablo@ptejada.com>
  */
 class PhpUnitOptions
 {
diff --git a/src/PHPCensor/Plugin/PackageBuild.php b/src/PHPCensor/Plugin/PackageBuild.php
index abeecc10..aa37cf6e 100644
--- a/src/PHPCensor/Plugin/PackageBuild.php
+++ b/src/PHPCensor/Plugin/PackageBuild.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * Create a ZIP or TAR.GZ archive of the entire build.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class PackageBuild extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Pdepend.php b/src/PHPCensor/Plugin/Pdepend.php
index 40a6066a..02ee87a6 100644
--- a/src/PHPCensor/Plugin/Pdepend.php
+++ b/src/PHPCensor/Plugin/Pdepend.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * Pdepend Plugin - Allows Pdepend report
  * 
- * @author       Johan van der Heide <info@japaveh.nl>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Johan van der Heide <info@japaveh.nl>
  */
 class Pdepend extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Pgsql.php b/src/PHPCensor/Plugin/Pgsql.php
index 968918b2..319d746c 100644
--- a/src/PHPCensor/Plugin/Pgsql.php
+++ b/src/PHPCensor/Plugin/Pgsql.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * PgSQL Plugin - Provides access to a PgSQL database.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class Pgsql extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Phar.php b/src/PHPCensor/Plugin/Phar.php
index 790924aa..b43b95ec 100644
--- a/src/PHPCensor/Plugin/Phar.php
+++ b/src/PHPCensor/Plugin/Phar.php
@@ -3,7 +3,6 @@
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use Phar as PHPPhar;
 use PHPCensor\Plugin;
diff --git a/src/PHPCensor/Plugin/Phing.php b/src/PHPCensor/Plugin/Phing.php
index aab8c916..a1f761af 100644
--- a/src/PHPCensor/Plugin/Phing.php
+++ b/src/PHPCensor/Plugin/Phing.php
@@ -1,25 +1,15 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin;
 
 /**
  * Phing Plugin - Provides access to Phing functionality.
  *
- * @author       Pavel Pavlov <ppavlov@alera.ru>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Pavel Pavlov <ppavlov@alera.ru>
  */
 class Phing extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/PhpCodeSniffer.php b/src/PHPCensor/Plugin/PhpCodeSniffer.php
index 53699c42..b14506c2 100644
--- a/src/PHPCensor/Plugin/PhpCodeSniffer.php
+++ b/src/PHPCensor/Plugin/PhpCodeSniffer.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -19,9 +12,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * PHP Code Sniffer Plugin - Allows PHP Code Sniffer testing.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/PhpCsFixer.php b/src/PHPCensor/Plugin/PhpCsFixer.php
index dc5b2feb..76b65858 100644
--- a/src/PHPCensor/Plugin/PhpCsFixer.php
+++ b/src/PHPCensor/Plugin/PhpCsFixer.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * PHP CS Fixer - Works with the PHP Coding Standards Fixer for testing coding standards.
  * 
- * @author       Gabriel Baker <gabriel@autonomicpilot.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Gabriel Baker <gabriel@autonomicpilot.co.uk>
  */
 class PhpCsFixer extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/PhpDocblockChecker.php b/src/PHPCensor/Plugin/PhpDocblockChecker.php
index 74389c40..6187d70e 100644
--- a/src/PHPCensor/Plugin/PhpDocblockChecker.php
+++ b/src/PHPCensor/Plugin/PhpDocblockChecker.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +11,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * PHP Docblock Checker Plugin - Checks your PHP files for appropriate uses of Docblocks
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class PhpDocblockChecker extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/PhpLoc.php b/src/PHPCensor/Plugin/PhpLoc.php
index 8852fb73..391fa6b0 100644
--- a/src/PHPCensor/Plugin/PhpLoc.php
+++ b/src/PHPCensor/Plugin/PhpLoc.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +11,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * PHP Loc - Allows PHP Copy / Lines of Code testing.
  * 
- * @author       Johan van der Heide <info@japaveh.nl>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Johan van der Heide <info@japaveh.nl>
  */
 class PhpLoc extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/PhpMessDetector.php b/src/PHPCensor/Plugin/PhpMessDetector.php
index ac1d574c..56e27e13 100644
--- a/src/PHPCensor/Plugin/PhpMessDetector.php
+++ b/src/PHPCensor/Plugin/PhpMessDetector.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +11,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * PHP Mess Detector Plugin - Allows PHP Mess Detector testing.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class PhpMessDetector extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/PhpParallelLint.php b/src/PHPCensor/Plugin/PhpParallelLint.php
index ddebd02e..4026ba82 100644
--- a/src/PHPCensor/Plugin/PhpParallelLint.php
+++ b/src/PHPCensor/Plugin/PhpParallelLint.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * Php Parallel Lint Plugin - Provides access to PHP lint functionality.
  * 
- * @author       Vaclav Makes <vaclav@makes.cz>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Vaclav Makes <vaclav@makes.cz>
  */
 class PhpParallelLint extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/PhpSpec.php b/src/PHPCensor/Plugin/PhpSpec.php
index 5d3918e9..5f339287 100644
--- a/src/PHPCensor/Plugin/PhpSpec.php
+++ b/src/PHPCensor/Plugin/PhpSpec.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -15,9 +8,7 @@ use PHPCensor\Plugin;
 /**
  * PHP Spec Plugin - Allows PHP Spec testing.
  * 
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 class PhpSpec extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/PhpTalLint.php b/src/PHPCensor/Plugin/PhpTalLint.php
index 41e44cd4..636df1e2 100644
--- a/src/PHPCensor/Plugin/PhpTalLint.php
+++ b/src/PHPCensor/Plugin/PhpTalLint.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * PHPTAL Lint Plugin - Provides access to PHPTAL lint functionality.
  * 
- * @author       Stephen Ball <phpci@stephen.rebelinblue.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Stephen Ball <phpci@stephen.rebelinblue.com>
  */
 class PhpTalLint extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/PhpUnit.php b/src/PHPCensor/Plugin/PhpUnit.php
index 8bbe6afa..7ad15045 100644
--- a/src/PHPCensor/Plugin/PhpUnit.php
+++ b/src/PHPCensor/Plugin/PhpUnit.php
@@ -1,17 +1,9 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
 use PHPCensor;
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Model\BuildError;
 use PHPCensor\Plugin\Option\PhpUnitOptions;
@@ -22,10 +14,8 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * PHP Unit Plugin - A rewrite of the original PHP Unit plugin
  *
- * @author       Dan Cryer <dan@block8.co.uk>
- * @author       Pablo Tejada <pablo@ptejada.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dan Cryer <dan@block8.co.uk>
+ * @author Pablo Tejada <pablo@ptejada.com>
  */
 class PhpUnit extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/SlackNotify.php b/src/PHPCensor/Plugin/SlackNotify.php
index 444c828e..a3ff12b9 100644
--- a/src/PHPCensor/Plugin/SlackNotify.php
+++ b/src/PHPCensor/Plugin/SlackNotify.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +12,7 @@ use Maknz\Slack\AttachmentField;
 /**
  * Slack Plugin
  * 
- * @author       Stephen Ball <phpci@stephen.rebelinblue.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Stephen Ball <phpci@stephen.rebelinblue.com>
  */
 class SlackNotify extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Sqlite.php b/src/PHPCensor/Plugin/Sqlite.php
index c984fc5f..4418c7ea 100644
--- a/src/PHPCensor/Plugin/Sqlite.php
+++ b/src/PHPCensor/Plugin/Sqlite.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -17,9 +10,7 @@ use PHPCensor\Plugin;
 /**
  * SQLite Plugin — Provides access to a SQLite database.
  * 
- * @author       Dmitry Khomutov <poisoncorpsee@gmail.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Dmitry Khomutov <poisoncorpsee@gmail.com>
  */
 class Sqlite extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/TechnicalDebt.php b/src/PHPCensor/Plugin/TechnicalDebt.php
index 5361584d..0a738817 100644
--- a/src/PHPCensor/Plugin/TechnicalDebt.php
+++ b/src/PHPCensor/Plugin/TechnicalDebt.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -18,9 +11,7 @@ use PHPCensor\ZeroConfigPluginInterface;
 /**
  * Technical Debt Plugin - Checks for existence of "TODO", "FIXME", etc.
  *
- * @author       James Inman <james@jamesinman.co.uk>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author James Inman <james@jamesinman.co.uk>
  */
 class TechnicalDebt extends Plugin implements ZeroConfigPluginInterface
 {
diff --git a/src/PHPCensor/Plugin/Util/Executor.php b/src/PHPCensor/Plugin/Util/Executor.php
index 4660e171..b9840f27 100644
--- a/src/PHPCensor/Plugin/Util/Executor.php
+++ b/src/PHPCensor/Plugin/Util/Executor.php
@@ -11,7 +11,6 @@ use PHPCensor\Store\BuildStore;
 
 /**
  * Plugin Executor - Runs the configured plugins for a given build stage.
- * @package PHPCensor\Plugin\Util
  */
 class Executor
 {
diff --git a/src/PHPCensor/Plugin/Util/Factory.php b/src/PHPCensor/Plugin/Util/Factory.php
index 267931b8..7be3b0f2 100644
--- a/src/PHPCensor/Plugin/Util/Factory.php
+++ b/src/PHPCensor/Plugin/Util/Factory.php
@@ -6,7 +6,6 @@ use Pimple\Container;
 
 /**
  * Plugin Factory - Loads Plugins and passes required dependencies.
- * @package PHPCensor\Plugin\Util
  */
 class Factory
 {
diff --git a/src/PHPCensor/Plugin/Util/PhpUnitResult.php b/src/PHPCensor/Plugin/Util/PhpUnitResult.php
index ef95d66f..04a75488 100644
--- a/src/PHPCensor/Plugin/Util/PhpUnitResult.php
+++ b/src/PHPCensor/Plugin/Util/PhpUnitResult.php
@@ -1,21 +1,11 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace PHPCensor\Plugin\Util;
 
 /**
  * Class PhpUnitResult parses the results for the PhpUnitV2 plugin
  *
- * @author       Pablo Tejada <pablo@ptejada.com>
- * @package      PHPCI
- * @subpackage   Plugin
+ * @author Pablo Tejada <pablo@ptejada.com>
  */
 class PhpUnitResult
 {
diff --git a/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php b/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php
index 346099f5..6c2594a9 100644
--- a/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php
+++ b/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php
@@ -8,7 +8,6 @@ use PHPCensor\Builder;
  * Class Codeception
  *
  * @author  Adam Cooper <adam@networkpie.co.uk>
- * @package PHPCensor\Plugin\Util\TestResultParsers
  */
 class Codeception implements ParserInterface
 {
diff --git a/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php b/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php
index cb58a0bb..ccd2d1ea 100644
--- a/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php
+++ b/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php
@@ -4,7 +4,6 @@ namespace PHPCensor\Plugin\Util\TestResultParsers;
 
 interface ParserInterface
 {
-
     /**
      * @return array An array of key/value pairs for storage in the plugins result metadata
      */
diff --git a/src/PHPCensor/Plugin/Wipe.php b/src/PHPCensor/Plugin/Wipe.php
index 7dc3f7cb..e02a08a9 100644
--- a/src/PHPCensor/Plugin/Wipe.php
+++ b/src/PHPCensor/Plugin/Wipe.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * Wipe Plugin - Wipes a folder
  * 
- * @author       Claus Due <claus@namelesscoder.net>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Claus Due <claus@namelesscoder.net>
  */
 class Wipe extends Plugin
 {
diff --git a/src/PHPCensor/Plugin/Xmpp.php b/src/PHPCensor/Plugin/Xmpp.php
index f62f73fe..7aa54bfe 100644
--- a/src/PHPCensor/Plugin/Xmpp.php
+++ b/src/PHPCensor/Plugin/Xmpp.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Plugin;
 
@@ -16,9 +9,7 @@ use PHPCensor\Plugin;
 /**
  * XMPP Notification - Send notification for successful or failure build
  * 
- * @author       Alexandre Russo <dev.github@ange7.com>
- * @package      PHPCI
- * @subpackage   Plugins
+ * @author Alexandre Russo <dev.github@ange7.com>
  */
 class XMPP extends Plugin
 {
diff --git a/src/PHPCensor/ProcessControl/Factory.php b/src/PHPCensor/ProcessControl/Factory.php
index 4ccd57ef..808077a8 100644
--- a/src/PHPCensor/ProcessControl/Factory.php
+++ b/src/PHPCensor/ProcessControl/Factory.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\ProcessControl;
 
diff --git a/src/PHPCensor/ProcessControl/PosixProcessControl.php b/src/PHPCensor/ProcessControl/PosixProcessControl.php
index d5a27e9f..4db218ec 100644
--- a/src/PHPCensor/ProcessControl/PosixProcessControl.php
+++ b/src/PHPCensor/ProcessControl/PosixProcessControl.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\ProcessControl;
 
diff --git a/src/PHPCensor/ProcessControl/ProcessControlInterface.php b/src/PHPCensor/ProcessControl/ProcessControlInterface.php
index 1de6c610..41b965a1 100644
--- a/src/PHPCensor/ProcessControl/ProcessControlInterface.php
+++ b/src/PHPCensor/ProcessControl/ProcessControlInterface.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\ProcessControl;
 
diff --git a/src/PHPCensor/ProcessControl/UnixProcessControl.php b/src/PHPCensor/ProcessControl/UnixProcessControl.php
index ee0781a3..4e12ced1 100644
--- a/src/PHPCensor/ProcessControl/UnixProcessControl.php
+++ b/src/PHPCensor/ProcessControl/UnixProcessControl.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\ProcessControl;
 
diff --git a/src/PHPCensor/Security/Authentication/LoginPasswordProviderInterface.php b/src/PHPCensor/Security/Authentication/LoginPasswordProviderInterface.php
index ba0a1896..f1e1f813 100644
--- a/src/PHPCensor/Security/Authentication/LoginPasswordProviderInterface.php
+++ b/src/PHPCensor/Security/Authentication/LoginPasswordProviderInterface.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2015, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace PHPCensor\Security\Authentication;
 
 use PHPCensor\Model\User;
diff --git a/src/PHPCensor/Security/Authentication/Service.php b/src/PHPCensor/Security/Authentication/Service.php
index 5dd69cf4..30bd1dd7 100644
--- a/src/PHPCensor/Security/Authentication/Service.php
+++ b/src/PHPCensor/Security/Authentication/Service.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2015, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace PHPCensor\Security\Authentication;
 
 use b8\Config;
diff --git a/src/PHPCensor/Security/Authentication/UserProvider/AbstractProvider.php b/src/PHPCensor/Security/Authentication/UserProvider/AbstractProvider.php
index 6d8cf8de..f5c8a618 100644
--- a/src/PHPCensor/Security/Authentication/UserProvider/AbstractProvider.php
+++ b/src/PHPCensor/Security/Authentication/UserProvider/AbstractProvider.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2014, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace PHPCensor\Security\Authentication\UserProvider;
 
 use PHPCensor\Security\Authentication\UserProviderInterface;
diff --git a/src/PHPCensor/Security/Authentication/UserProvider/Internal.php b/src/PHPCensor/Security/Authentication/UserProvider/Internal.php
index ff8c7853..b5fe70f2 100644
--- a/src/PHPCensor/Security/Authentication/UserProvider/Internal.php
+++ b/src/PHPCensor/Security/Authentication/UserProvider/Internal.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2014, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace PHPCensor\Security\Authentication\UserProvider;
 
 use PHPCensor\Model\User;
diff --git a/src/PHPCensor/Security/Authentication/UserProvider/Ldap.php b/src/PHPCensor/Security/Authentication/UserProvider/Ldap.php
index 46593475..eee5ca3b 100644
--- a/src/PHPCensor/Security/Authentication/UserProvider/Ldap.php
+++ b/src/PHPCensor/Security/Authentication/UserProvider/Ldap.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2014, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace PHPCensor\Security\Authentication\UserProvider;
 
 use b8\Store\Factory;
diff --git a/src/PHPCensor/Security/Authentication/UserProviderInterface.php b/src/PHPCensor/Security/Authentication/UserProviderInterface.php
index 4861a83b..38b0da26 100644
--- a/src/PHPCensor/Security/Authentication/UserProviderInterface.php
+++ b/src/PHPCensor/Security/Authentication/UserProviderInterface.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2015, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace PHPCensor\Security\Authentication;
 
 use PHPCensor\Model\User;
diff --git a/src/PHPCensor/Service/BuildService.php b/src/PHPCensor/Service/BuildService.php
index 26017a16..7e26b219 100644
--- a/src/PHPCensor/Service/BuildService.php
+++ b/src/PHPCensor/Service/BuildService.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Service;
 
@@ -13,15 +6,12 @@ use b8\Config;
 use Pheanstalk\Pheanstalk;
 use Pheanstalk\PheanstalkInterface;
 use PHPCensor\BuildFactory;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Model\Project;
 use PHPCensor\Store\BuildStore;
 
 /**
  * The build service handles the creation, duplication and deletion of builds.
- * Class BuildService
- * @package PHPCensor\Service
  */
 class BuildService
 {
diff --git a/src/PHPCensor/Service/BuildStatusService.php b/src/PHPCensor/Service/BuildStatusService.php
index dcde6ee6..8a323d18 100644
--- a/src/PHPCensor/Service/BuildStatusService.php
+++ b/src/PHPCensor/Service/BuildStatusService.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Service;
 
@@ -14,7 +7,6 @@ use PHPCensor\Model\Build;
 
 /**
  * Class BuildStatusService
- * @package PHPCensor\Service
  */
 class BuildStatusService
 {
diff --git a/src/PHPCensor/Service/ProjectService.php b/src/PHPCensor/Service/ProjectService.php
index 56805e63..a52fb273 100644
--- a/src/PHPCensor/Service/ProjectService.php
+++ b/src/PHPCensor/Service/ProjectService.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Service;
 
@@ -14,8 +7,6 @@ use PHPCensor\Store\ProjectStore;
 
 /**
  * The project service handles the creation, modification and deletion of projects.
- * Class ProjectService
- * @package PHPCensor\Service
  */
 class ProjectService
 {
diff --git a/src/PHPCensor/Service/UserService.php b/src/PHPCensor/Service/UserService.php
index e7a27212..7cb47852 100644
--- a/src/PHPCensor/Service/UserService.php
+++ b/src/PHPCensor/Service/UserService.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor\Service;
 
@@ -14,8 +7,6 @@ use PHPCensor\Store\UserStore;
 
 /**
  * The user service handles the creation, modification and deletion of users.
- * Class UserService
- * @package PHPCensor\Service
  */
 class UserService
 {
diff --git a/src/PHPCensor/Store.php b/src/PHPCensor/Store.php
index fe3ba882..0a065b85 100644
--- a/src/PHPCensor/Store.php
+++ b/src/PHPCensor/Store.php
@@ -1,18 +1,7 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor;
 
-/**
- * PHPCI Base Store
- * @package PHPCI
- */
 abstract class Store extends \b8\Store
 {
 
diff --git a/src/PHPCensor/ZeroConfigPluginInterface.php b/src/PHPCensor/ZeroConfigPluginInterface.php
index 19007e17..23092371 100644
--- a/src/PHPCensor/ZeroConfigPluginInterface.php
+++ b/src/PHPCensor/ZeroConfigPluginInterface.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
 
 namespace PHPCensor;
 
@@ -13,7 +6,8 @@ use PHPCensor\Model\Build;
 
 /**
  * PHPCI Plugin Interface - Used by all build plugins.
- * @author   Dan Cryer <dan@block8.co.uk>
+ * 
+ * @author Dan Cryer <dan@block8.co.uk>
  */
 interface ZeroConfigPluginInterface
 {
diff --git a/tests/PHPCensor/Command/CreateAdminCommandTest.php b/tests/PHPCensor/Command/CreateAdminCommandTest.php
index 65fd2a8a..e832c3e8 100644
--- a/tests/PHPCensor/Command/CreateAdminCommandTest.php
+++ b/tests/PHPCensor/Command/CreateAdminCommandTest.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Command;
 
 use PHPCensor\Command\CreateAdminCommand;
-use PHPCensor\Store\UserStore;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/tests/PHPCensor/Command/CreateBuildCommandTest.php b/tests/PHPCensor/Command/CreateBuildCommandTest.php
index 97196ede..033e647b 100644
--- a/tests/PHPCensor/Command/CreateBuildCommandTest.php
+++ b/tests/PHPCensor/Command/CreateBuildCommandTest.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license        https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link            http://www.phptesting.org/
- */
 
 namespace Tests\PHPCensor\Command;
 
diff --git a/tests/PHPCensor/Controller/WebhookControllerTest.php b/tests/PHPCensor/Controller/WebhookControllerTest.php
index 4c1e7a3b..fd4480c5 100644
--- a/tests/PHPCensor/Controller/WebhookControllerTest.php
+++ b/tests/PHPCensor/Controller/WebhookControllerTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Controller;
 
 use PHPCensor\Controller\WebhookController;
diff --git a/tests/PHPCensor/Helper/AnsiConverterTest.php b/tests/PHPCensor/Helper/AnsiConverterTest.php
index 057c1e1f..2ee7a7ef 100644
--- a/tests/PHPCensor/Helper/AnsiConverterTest.php
+++ b/tests/PHPCensor/Helper/AnsiConverterTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Helper;
 
 use PHPCensor\Helper\AnsiConverter;
diff --git a/tests/PHPCensor/Helper/BuildInterpolatorTest.php b/tests/PHPCensor/Helper/BuildInterpolatorTest.php
index 1b54832f..2528c1f0 100644
--- a/tests/PHPCensor/Helper/BuildInterpolatorTest.php
+++ b/tests/PHPCensor/Helper/BuildInterpolatorTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Helper;
 
 use PHPCensor\Helper\BuildInterpolator;
diff --git a/tests/PHPCensor/Helper/CommandExecutorTest.php b/tests/PHPCensor/Helper/CommandExecutorTest.php
index d719622d..d9ecd166 100644
--- a/tests/PHPCensor/Helper/CommandExecutorTest.php
+++ b/tests/PHPCensor/Helper/CommandExecutorTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Helper;
 
 use PHPCensor\Helper\UnixCommandExecutor;
diff --git a/tests/PHPCensor/Helper/LangTest.php b/tests/PHPCensor/Helper/LangTest.php
index b340888b..9a1c9ad7 100644
--- a/tests/PHPCensor/Helper/LangTest.php
+++ b/tests/PHPCensor/Helper/LangTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Helper;
 
 use Tests\PHPCensor\LocalizationTestCase;
diff --git a/tests/PHPCensor/Helper/MailerFactoryTest.php b/tests/PHPCensor/Helper/MailerFactoryTest.php
index 64f9e654..738db902 100644
--- a/tests/PHPCensor/Helper/MailerFactoryTest.php
+++ b/tests/PHPCensor/Helper/MailerFactoryTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace tests\PHPCensor\Service;
 
 use PHPCensor\Helper\MailerFactory;
diff --git a/tests/PHPCensor/Logging/BuildLoggerTest.php b/tests/PHPCensor/Logging/BuildLoggerTest.php
index ee8d7cda..762abf7d 100644
--- a/tests/PHPCensor/Logging/BuildLoggerTest.php
+++ b/tests/PHPCensor/Logging/BuildLoggerTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Helper;
 
 use PHPCensor\Logging\BuildLogger;
diff --git a/tests/PHPCensor/Logging/LoggerConfigTest.php b/tests/PHPCensor/Logging/LoggerConfigTest.php
index 51c5de33..0a85e332 100644
--- a/tests/PHPCensor/Logging/LoggerConfigTest.php
+++ b/tests/PHPCensor/Logging/LoggerConfigTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Helper;
 
 use \PHPCensor\Logging\LoggerConfig;
diff --git a/tests/PHPCensor/Model/BuildTest.php b/tests/PHPCensor/Model/BuildTest.php
index 096fda34..cd68f82a 100644
--- a/tests/PHPCensor/Model/BuildTest.php
+++ b/tests/PHPCensor/Model/BuildTest.php
@@ -1,14 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-
 namespace Tests\PHPCensor\Model;
 
 use PHPCensor\Model\Build;
@@ -16,6 +7,7 @@ use PHPCensor\Model;
 
 /**
  * Unit tests for the Build model class.
+ * 
  * @author Dan Cryer <dan@block8.co.uk>
  */
 class BuildTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PHPCensor/Model/ProjectTest.php b/tests/PHPCensor/Model/ProjectTest.php
index 4eed900f..4fad6d98 100644
--- a/tests/PHPCensor/Model/ProjectTest.php
+++ b/tests/PHPCensor/Model/ProjectTest.php
@@ -1,14 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-
 namespace Tests\PHPCensor\Model;
 
 use PHPCensor\Model\Project;
@@ -16,6 +7,7 @@ use PHPCensor\Model;
 
 /**
  * Unit tests for the Project model class.
+ * 
  * @author Dan Cryer <dan@block8.co.uk>
  */
 class ProjectTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PHPCensor/Plugin/EmailTest.php b/tests/PHPCensor/Plugin/EmailTest.php
index 1af168cb..0ee8ef4f 100644
--- a/tests/PHPCensor/Plugin/EmailTest.php
+++ b/tests/PHPCensor/Plugin/EmailTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2013, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin;
 
 use b8\Config;
@@ -16,6 +8,7 @@ use PHPCensor\Model\Build;
 
 /**
  * Unit test for the PHPUnit plugin.
+ * 
  * @author meadsteve
  */
 class EmailTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PHPCensor/Plugin/Option/PhpUnitOptionsTest.php b/tests/PHPCensor/Plugin/Option/PhpUnitOptionsTest.php
index 880cee22..cd5d9acc 100644
--- a/tests/PHPCensor/Plugin/Option/PhpUnitOptionsTest.php
+++ b/tests/PHPCensor/Plugin/Option/PhpUnitOptionsTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2013, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin;
 
 use PHPCensor\Plugin\Option\PhpUnitOptions;
diff --git a/tests/PHPCensor/Plugin/PharTest.php b/tests/PHPCensor/Plugin/PharTest.php
index ae35092b..8f8f469c 100644
--- a/tests/PHPCensor/Plugin/PharTest.php
+++ b/tests/PHPCensor/Plugin/PharTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin;
 
 use PHPCensor\Plugin\Phar as PharPlugin;
diff --git a/tests/PHPCensor/Plugin/PhpUnitTest.php b/tests/PHPCensor/Plugin/PhpUnitTest.php
index 11cab788..bf21e79f 100644
--- a/tests/PHPCensor/Plugin/PhpUnitTest.php
+++ b/tests/PHPCensor/Plugin/PhpUnitTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2013, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin;
 
 /**
diff --git a/tests/PHPCensor/Plugin/Util/ExamplePluginConfig.php b/tests/PHPCensor/Plugin/Util/ExamplePluginConfig.php
deleted file mode 100644
index 3eb2687a..00000000
--- a/tests/PHPCensor/Plugin/Util/ExamplePluginConfig.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-return function (PHPCensor\Plugin\Util\Factory $factory) {
-    $factory->registerResource(
-        // This function will be called when the resource is needed.
-        function() {
-            return [
-                'bar' => "Hello",
-            ];
-        },
-        "requiredArgument",
-        null
-    );
-};
diff --git a/tests/PHPCensor/Plugin/Util/ExecutorTest.php b/tests/PHPCensor/Plugin/Util/ExecutorTest.php
index 5bbe00fb..c22c0f91 100644
--- a/tests/PHPCensor/Plugin/Util/ExecutorTest.php
+++ b/tests/PHPCensor/Plugin/Util/ExecutorTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util;
 
 use PHPCensor\Plugin\Util\Executor;
diff --git a/tests/PHPCensor/Plugin/Util/FactoryTest.php b/tests/PHPCensor/Plugin/Util/FactoryTest.php
index bfb28696..5acdb813 100644
--- a/tests/PHPCensor/Plugin/Util/FactoryTest.php
+++ b/tests/PHPCensor/Plugin/Util/FactoryTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util;
 
 use PHPCensor\Plugin\Util\Factory;
@@ -133,31 +125,6 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
         $this->assertArrayHasKey('thing', $plugin->options);
     }
 
-    public function testAddConfigFromFile_ReturnsTrueForValidFile()
-    {
-        $result = $this->testedFactory->addConfigFromFile(
-            realpath(__DIR__ . "/ExamplePluginConfig.php")
-        );
-
-        $this->assertTrue($result);
-    }
-
-    public function testAddConfigFromFile_RegistersResources()
-    {
-        $this->testedFactory->addConfigFromFile(
-            realpath(__DIR__ . "/ExamplePluginConfig.php")
-        );
-
-        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg');
-        $plugin = $this->testedFactory->buildPlugin($pluginClass);
-
-        // The Example config file defines an array as the resource.
-        $this->assertEquals(
-            ["bar" => "Hello"],
-            $plugin->RequiredArgument
-        );
-    }
-
     /**
      * Registers mocked Builder and Build classes so that realistic plugins
      * can be tested.
diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php
index 1179badf..15c3bfbb 100644
--- a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util\Fake;
 
 use PHPCensor\Builder;
diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
index 7c3a673d..c039599d 100644
--- a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util\Fake;
 
 use PHPCensor\Plugin;
diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
index c09f241f..284537d6 100644
--- a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util\Fake;
 
 use PHPCensor\Plugin;
diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
index 80747a59..8e7942ca 100644
--- a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util\Fake;
 
 use PHPCensor\Plugin;
diff --git a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
index 6e0dcb11..29e3dbae 100644
--- a/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util\Fake;
 
 use PHPCensor\Plugin;
diff --git a/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php b/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php
index cd5e0851..c81ef4b6 100644
--- a/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php
+++ b/tests/PHPCensor/Plugin/Util/PhpUnitResultTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Plugin\Util;
 
 use PHPCensor\Plugin\Util\PhpUnitResult;
diff --git a/tests/PHPCensor/Security/Authentication/ServiceTest.php b/tests/PHPCensor/Security/Authentication/ServiceTest.php
index 793f8c66..f5b31e76 100644
--- a/tests/PHPCensor/Security/Authentication/ServiceTest.php
+++ b/tests/PHPCensor/Security/Authentication/ServiceTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Security\Authentication;
 
 use PHPCensor\Security\Authentication\Service;
diff --git a/tests/PHPCensor/Security/Authentication/UserProvider/InternalTest.php b/tests/PHPCensor/Security/Authentication/UserProvider/InternalTest.php
index 08241db7..9412caf6 100644
--- a/tests/PHPCensor/Security/Authentication/UserProvider/InternalTest.php
+++ b/tests/PHPCensor/Security/Authentication/UserProvider/InternalTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright Copyright 2014, Block 8 Limited.
- * @license   https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link      https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Security\Authentication\UserProvider;
 
 use PHPCensor\Model\User;
diff --git a/tests/PHPCensor/Service/BuildServiceTest.php b/tests/PHPCensor/Service/BuildServiceTest.php
index ba0f97ad..6c8fa1a6 100644
--- a/tests/PHPCensor/Service/BuildServiceTest.php
+++ b/tests/PHPCensor/Service/BuildServiceTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Service;
 
 use PHPCensor\Model\Build;
@@ -16,6 +8,7 @@ use PHPCensor\Service\BuildService;
 
 /**
  * Unit tests for the ProjectService class.
+ * 
  * @author Dan Cryer <dan@block8.co.uk>
  */
 class BuildServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PHPCensor/Service/BuiltStatusServiceTest.php b/tests/PHPCensor/Service/BuiltStatusServiceTest.php
index a50a74c6..393496b8 100644
--- a/tests/PHPCensor/Service/BuiltStatusServiceTest.php
+++ b/tests/PHPCensor/Service/BuiltStatusServiceTest.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         http://www.phptesting.org/
- */
 
 namespace PHPCensor\Service\Tests;
 
@@ -15,6 +8,7 @@ use PHPCensor\Service\BuildStatusService;
 
 /**
  * Unit tests for the ProjectService class.
+ * 
  * @author Dan Cryer <dan@block8.co.uk>
  */
 class BuildStatusServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PHPCensor/Service/ProjectServiceTest.php b/tests/PHPCensor/Service/ProjectServiceTest.php
index 83cfee10..fbb4efe1 100644
--- a/tests/PHPCensor/Service/ProjectServiceTest.php
+++ b/tests/PHPCensor/Service/ProjectServiceTest.php
@@ -1,14 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-
 namespace Tests\PHPCensor\Service;
 
 use PHPCensor\Model\Project;
@@ -16,6 +7,7 @@ use PHPCensor\Service\ProjectService;
 
 /**
  * Unit tests for the ProjectService class.
+ * 
  * @author Dan Cryer <dan@block8.co.uk>
  */
 class ProjectServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PHPCensor/Service/UserServiceTest.php b/tests/PHPCensor/Service/UserServiceTest.php
index a107d38e..679c2d65 100644
--- a/tests/PHPCensor/Service/UserServiceTest.php
+++ b/tests/PHPCensor/Service/UserServiceTest.php
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2014, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
 namespace Tests\PHPCensor\Service;
 
 use PHPCensor\Model\User;
@@ -15,6 +7,7 @@ use PHPCensor\Service\UserService;
 
 /**
  * Unit tests for the ProjectService class.
+ * 
  * @author Dan Cryer <dan@block8.co.uk>
  */
 class UserServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f7e42b62..f308bdc6 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2013, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         http://www.phptesting.org/
- */
 
 if (!defined('ROOT_DIR')) {
     define('ROOT_DIR', dirname(__DIR__) . DIRECTORY_SEPARATOR);