More scrap code