3.0 deprecation cleanup

Refs https://github.com/cakephp/cakephp/pull/2624