Got rid of unused stuff.