removed some scrap code