Get rid of some of unused code