Get rid of some old unnecesary stuff