Clean up scrap code