Got rid of unused code.