Cleanup use statements/remove array short syntax