Small phpcs fixes

Fixed some phpcs issues and removed unused uses. 107 issues from scrutinizer tests were fixed