Remove redundant use statements
Fix phpcs
Merge branch 'master' into refactor/remove_flexible_manager_config