minor code scrapping