Scrutinizer Cleanup.