Resharper Cleanup