Get rid of some unused code