Small phpcs fixes

Fixed some small phpcs issues and removed unused uses