Removing references to removed PermissionServiceInterface
Fixing execution order and phpcs config, psr2 fix