Remove old traits
PHP Scrutinizer changes
whitespace
Bugfixes for traits