Fix composer syntax
- CS fix
- remove unused "use"
Merge branch 'master' into 2.3