diff --git a/src/Console/Command/UpgradeShell.php b/src/Console/Command/UpgradeShell.php
index 813126d0eda..aa37f1df90d 100644
--- a/src/Console/Command/UpgradeShell.php
+++ b/src/Console/Command/UpgradeShell.php
@@ -210,8 +210,6 @@ public function app_uses() {
  * Replace all the App::uses() calls with `use`.
  *
  * @param string $file The file to search and replace.
- * @param boolean $dryRun Whether or not to do the thing
- * @return mixed Replacement of uses call
  */
 	protected function _replaceUses($file) {
 		$pattern = '#App::uses\([\'"]([a-z0-9_]+)[\'"],\s*[\'"]([a-z0-9/_]+)(?:\.([a-z0-9/_]+))?[\'"]\)#i';
diff --git a/src/Controller/Component/Acl/IniAcl.php b/src/Controller/Component/Acl/IniAcl.php
index 2cb835cb38e..c1ec96ea44f 100644
--- a/src/Controller/Component/Acl/IniAcl.php
+++ b/src/Controller/Component/Acl/IniAcl.php
@@ -57,7 +57,6 @@ public function initialize(Component $component) {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
  */
 	public function allow($aro, $aco, $action = "*") {
 	}
@@ -68,7 +67,6 @@ public function allow($aro, $aco, $action = "*") {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
  */
 	public function deny($aro, $aco, $action = "*") {
 	}
@@ -79,7 +77,6 @@ public function deny($aro, $aco, $action = "*") {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
  */
 	public function inherit($aro, $aco, $action = "*") {
 	}
diff --git a/src/Controller/Component/Auth/BaseAuthenticate.php b/src/Controller/Component/Auth/BaseAuthenticate.php
index 9aa5ebcb36e..458ba995113 100644
--- a/src/Controller/Component/Auth/BaseAuthenticate.php
+++ b/src/Controller/Component/Auth/BaseAuthenticate.php
@@ -196,8 +196,6 @@ public function getUser(Request $request) {
  *
  * @param Cake\Network\Request $request A request object.
  * @param Cake\Network\Response $response A response object.
- * @return mixed Either true to indicate the unauthenticated request has been
- *  dealt with and no more action is required by AuthComponent or void (default).
  */
 	public function unauthenticated(Request $request, Response $response) {
 	}
diff --git a/src/Controller/Component/PaginatorComponent.php b/src/Controller/Component/PaginatorComponent.php
index 1d465375f22..5e100eb179e 100644
--- a/src/Controller/Component/PaginatorComponent.php
+++ b/src/Controller/Component/PaginatorComponent.php
@@ -274,7 +274,6 @@ public function getDefaults($alias, $defaults) {
  *
  * @param Table $object The model being paginated.
  * @param array $options The pagination options being used for this request.
- * @param array $whitelist The list of columns that can be used for sorting. If empty all keys are allowed.
  * @return array An array of options with sort + direction removed and replaced with order if possible.
  */
 	public function validateSort(Table $object, array $options) {
diff --git a/src/Controller/Component/RequestHandlerComponent.php b/src/Controller/Component/RequestHandlerComponent.php
index a0ec959c0db..dc77df38a2e 100644
--- a/src/Controller/Component/RequestHandlerComponent.php
+++ b/src/Controller/Component/RequestHandlerComponent.php
@@ -196,7 +196,6 @@ protected function _setExtension() {
  *   to the $data property of the controller, which can then be saved to a model object.
  *
  * @param Event $event The startup event that was fired.
- * @param Controller $controller A reference to the controller
  * @return void
  */
 	public function startup(Event $event) {
@@ -278,7 +277,6 @@ public function beforeRedirect(Event $event, $url, $response) {
  * "304 Not Modified" header.
  *
  * @param Event $event The Controller.beforeRender event.
- * @param Controller $controller
  * @return boolean false if the render process should be aborted
  */
 	public function beforeRender(Event $event) {
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
index 7930b0aaf32..83c70c77e75 100644
--- a/src/Controller/Controller.php
+++ b/src/Controller/Controller.php
@@ -733,7 +733,6 @@ public function beforeRender(Event $event) {
  *     or an absolute URL
  * @param integer $status Optional HTTP status code (eg: 404)
  * @param boolean $exit If true, exit() will be called after the redirect
- * @return mixed
  *   false to stop redirection event,
  *   string controllers a new redirection URL or
  *   array with the keys url, status and exit to be used by the redirect method.
@@ -746,7 +745,6 @@ public function beforeRedirect(Event $event, $url, $status = null, $exit = true)
  * Called after the controller action is run and rendered.
  *
  * @param Event $event An Event instance
- * @return void
  * @link http://book.cakephp.org/2.0/en/controllers.html#request-life-cycle-callbacks
  */
 	public function afterFilter(Event $event) {
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
index 38fb2f56bd8..acf26583369 100644
--- a/src/Database/Connection.php
+++ b/src/Database/Connection.php
@@ -86,7 +86,6 @@ class Connection {
  * Constructor
  *
  * @param array $config configuration for connecting to database
- * @return self
  */
 	public function __construct($config) {
 		$this->_config = $config;
diff --git a/src/Database/IdentifierQuoter.php b/src/Database/IdentifierQuoter.php
index bc7157a26e1..ac4eed862e1 100644
--- a/src/Database/IdentifierQuoter.php
+++ b/src/Database/IdentifierQuoter.php
@@ -154,7 +154,6 @@ protected function _quoteJoins($joins) {
  * Quotes the table name and columns for an insert query
  *
  * @param Query $query
- * @return Query
  */
 	protected function _quoteInsert($query) {
 		list($table, $columns) = $query->clause('insert');
diff --git a/src/Network/Http/Message.php b/src/Network/Http/Message.php
index f84157dd877..6124346d83d 100644
--- a/src/Network/Http/Message.php
+++ b/src/Network/Http/Message.php
@@ -167,7 +167,6 @@ public function cookies() {
 /**
  * Get the HTTP version used.
  *
- * @param null|string $version
  * @return string
  */
 	public function version() {
diff --git a/src/ORM/Associations.php b/src/ORM/Associations.php
index fbd464b72ce..f9347885de8 100644
--- a/src/ORM/Associations.php
+++ b/src/ORM/Associations.php
@@ -133,7 +133,6 @@ public function saveParents(Table $table, Entity $entity, $associations, $option
  *
  * @param Table $table The table entity is for.
  * @param Entity $entity The entity to save associated data for.
- * @param Entity $entity The entity to save associated data for.
  * @param array $associations The list of associations to save children from.
  *   associations not in this list will not be saved.
  * @param array $options The options for the save operation.