Get rid of unsued code