Cleanup for Scrutinizer