Got rid of some unused code