Removed scrap stuff