Remove unsued code